Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace several NSAssert with FML_CHECK/DCHECK to unblock the build #53048

Merged
merged 3 commits into from
May 30, 2024
Merged

Replace several NSAssert with FML_CHECK/DCHECK to unblock the build #53048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad69cbc
Replace several NSAssert with FML_DCHECK to unblock the build
bc-lee May 26, 2024
cdbd40e
Remove NSAssert which should be replaced with FML_DCHECK
bc-lee May 29, 2024
2e3cef5
Use FML_CHECK instead of FML_DCHECK to work around clang-tidy warnings
bc-lee May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shell/platform/darwin/macos/framework/Source/FlutterEmbedderExternalTextureTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ - (CVPixelBufferRef)pixelBuffer {
CVPixelBufferRef pxbuffer = NULL;
CVReturn status = CVPixelBufferCreate(kCFAllocatorDefault, _width, _width, _pixelFormatType,
(__bridge CFDictionaryRef)options, &pxbuffer);
NSAssert(status == kCVReturnSuccess && pxbuffer != NULL, @"Failed to create pixel buffer.");
FML_CHECK(status == kCVReturnSuccess && pxbuffer != nullptr) << "Failed to create pixel buffer";
return pxbuffer;
}

Expand Down
7 changes: 4 additions & 3 deletions shell/platform/darwin/macos/framework/Source/FlutterEmbedderKeyResponder.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,10 @@ static uint64_t GetLogicalKeyForEvent(NSEvent* event, uint64_t physicalKey) {
uint32_t* keyLabel = DecodeUtf16(keyLabelUtf16, &keyLabelLength);
if (keyLabelLength == 1) {
uint32_t keyLabelChar = *keyLabel;
NSCAssert(!IsControlCharacter(keyLabelChar) && !IsUnprintableKey(keyLabelChar),
@"Unexpected control or unprintable keylabel 0x%x", keyLabelChar);
NSCAssert(keyLabelChar <= 0x10FFFF, @"Out of range keylabel 0x%x", keyLabelChar);
FML_DCHECK(!IsControlCharacter(keyLabelChar) && !IsUnprintableKey(keyLabelChar))
<< "Unexpected control or unprintable keylabel 0x" << std::hex << keyLabelChar;
FML_DCHECK(keyLabelChar <= 0x10FFFF)
<< "Out of range keylabel 0x" << std::hex << keyLabelChar;
character = keyLabelChar;
}
delete[] keyLabel;
Expand Down