未验证 提交 382f5ccb 编写于 作者: R Robert Ancell 提交者: GitHub

Fix incorrect parameter used for self object (#22135)

Fix incorrect parameter used for self object

Rename the GWeakNotify function parameters.
This matches the prototype and makes it harder to accidentally use the object
parameter the wrong way.
上级 8c5b0a6a
...@@ -100,7 +100,8 @@ static void platform_message_handler_free(gpointer data) { ...@@ -100,7 +100,8 @@ static void platform_message_handler_free(gpointer data) {
g_free(self); g_free(self);
} }
static void engine_weak_notify_cb(gpointer user_data, GObject* object) { static void engine_weak_notify_cb(gpointer user_data,
GObject* where_the_object_was) {
FlBinaryMessenger* self = FL_BINARY_MESSENGER(user_data); FlBinaryMessenger* self = FL_BINARY_MESSENGER(user_data);
self->engine = nullptr; self->engine = nullptr;
......
...@@ -152,7 +152,8 @@ static gboolean flutter_source_dispatch(GSource* source, ...@@ -152,7 +152,8 @@ static gboolean flutter_source_dispatch(GSource* source,
} }
// Called when the engine is disposed. // Called when the engine is disposed.
static void engine_weak_notify_cb(gpointer user_data, GObject* object) { static void engine_weak_notify_cb(gpointer user_data,
GObject* where_the_object_was) {
FlutterSource* source = reinterpret_cast<FlutterSource*>(user_data); FlutterSource* source = reinterpret_cast<FlutterSource*>(user_data);
source->engine = nullptr; source->engine = nullptr;
g_source_destroy(reinterpret_cast<GSource*>(source)); g_source_destroy(reinterpret_cast<GSource*>(source));
......
...@@ -140,8 +140,9 @@ static void method_call_cb(FlMethodChannel* channel, ...@@ -140,8 +140,9 @@ static void method_call_cb(FlMethodChannel* channel,
} }
} }
static void view_weak_notify_cb(gpointer user_data, GObject* object) { static void view_weak_notify_cb(gpointer user_data,
FlMouseCursorPlugin* self = FL_MOUSE_CURSOR_PLUGIN(object); GObject* where_the_object_was) {
FlMouseCursorPlugin* self = FL_MOUSE_CURSOR_PLUGIN(user_data);
self->view = nullptr; self->view = nullptr;
} }
......
...@@ -22,7 +22,8 @@ G_MODULE_EXPORT GType fl_plugin_registrar_get_type(); ...@@ -22,7 +22,8 @@ G_MODULE_EXPORT GType fl_plugin_registrar_get_type();
G_DEFINE_TYPE(FlPluginRegistrar, fl_plugin_registrar, G_TYPE_OBJECT) G_DEFINE_TYPE(FlPluginRegistrar, fl_plugin_registrar, G_TYPE_OBJECT)
static void view_weak_notify_cb(gpointer user_data, GObject* object) { static void view_weak_notify_cb(gpointer user_data,
GObject* where_the_object_was) {
FlPluginRegistrar* self = FL_PLUGIN_REGISTRAR(user_data); FlPluginRegistrar* self = FL_PLUGIN_REGISTRAR(user_data);
self->view = nullptr; self->view = nullptr;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册