DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix function type cast warnings for macOS embedder callbacks (flutter/engine#52377)

Browse Source 
The latest version of Clang is reporting warnings from the -Wcast-function-type-mismatch check when a function taking a __strong pointer parameter is converted to a void* parameter.
This commit is contained in:
Jason Simmons 2024-04-26 08:28:11 -07:00 committed by GitHub
parent dad62d2ab2
commit bef76e554e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterEngine.mm
View File

@ -399,7 +399,8 @@ constexpr char kTextPlainFormat[] = "text/plain";
// Callbacks provided to the engine. See the called methods for documentation.
#pragma mark - Static methods provided to engine configuration
static void OnPlatformMessage(const FlutterPlatformMessage* message, FlutterEngine* engine) {
static void OnPlatformMessage(const FlutterPlatformMessage* message, void* user_data) {
FlutterEngine* engine = (__bridge FlutterEngine*)user_data;
[engine engineCallbackOnPlatformMessage:message];
}

8
engine/src/flutter/shell/platform/darwin/macos/framework/Source/FlutterRenderer.mm
View File

@ -12,22 +12,22 @@
#pragma mark - Static callbacks that require the engine.
static FlutterMetalTexture OnGetNextDrawable(FlutterEngine* engine,
const FlutterFrameInfo* frameInfo) {
static FlutterMetalTexture OnGetNextDrawable(void* user_data, const FlutterFrameInfo* frameInfo) {
NSCAssert(NO, @"The renderer config should not be used to get the next drawable.");
return FlutterMetalTexture{};
}
static bool OnPresentDrawable(FlutterEngine* engine, const FlutterMetalTexture* texture) {
static bool OnPresentDrawable(void* user_data, const FlutterMetalTexture* texture) {
NSCAssert(NO, @"The renderer config should not be used to present drawable.");
return false;
}
static bool OnAcquireExternalTexture(FlutterEngine* engine,
static bool OnAcquireExternalTexture(void* user_data,
int64_t textureIdentifier,
size_t width,
size_t height,
FlutterMetalExternalTexture* metalTexture) {
FlutterEngine* engine = (__bridge FlutterEngine*)user_data;
return [engine.renderer populateTextureWithIdentifier:textureIdentifier
metalTexture:metalTexture];
}