diff --git a/engine/src/flutter/shell/platform/linux/fl_engine.cc b/engine/src/flutter/shell/platform/linux/fl_engine.cc index f1ab9299875..920e60af106 100644 --- a/engine/src/flutter/shell/platform/linux/fl_engine.cc +++ b/engine/src/flutter/shell/platform/linux/fl_engine.cc @@ -131,7 +131,7 @@ static void view_added_cb(const FlutterAddViewResult* result) { FlutterViewId view_id = GPOINTER_TO_INT(g_task_get_task_data(task)); if (result->added) { - g_task_return_pointer(task, GINT_TO_POINTER(view_id), nullptr); + g_task_return_int(task, view_id); } else { g_task_return_new_error(task, fl_engine_error_quark(), FL_ENGINE_ERROR_FAILED, "Failed to add view"); @@ -680,7 +680,7 @@ FlutterViewId fl_engine_add_view_finish(FlEngine* self, GAsyncResult* result, GError** error) { g_return_val_if_fail(FL_IS_ENGINE(self), FALSE); - return GPOINTER_TO_INT(g_task_propagate_pointer(G_TASK(result), error)); + return g_task_propagate_int(G_TASK(result), error); } void fl_engine_remove_view(FlEngine* self, diff --git a/engine/src/flutter/shell/platform/linux/fl_engine_private.h b/engine/src/flutter/shell/platform/linux/fl_engine_private.h index b507de96e28..1ffa5e28aa6 100644 --- a/engine/src/flutter/shell/platform/linux/fl_engine_private.h +++ b/engine/src/flutter/shell/platform/linux/fl_engine_private.h @@ -134,7 +134,7 @@ void fl_engine_add_view(FlEngine* engine, * * Completes request started with fl_engine_add_view(). * - * Returns: the newly added view ID or 0 on error. + * Returns: the newly added view ID or -1 on error. */ FlutterViewId fl_engine_add_view_finish(FlEngine* engine, GAsyncResult* result, diff --git a/engine/src/flutter/shell/platform/linux/fl_engine_test.cc b/engine/src/flutter/shell/platform/linux/fl_engine_test.cc index e051d480525..7e5329da40b 100644 --- a/engine/src/flutter/shell/platform/linux/fl_engine_test.cc +++ b/engine/src/flutter/shell/platform/linux/fl_engine_test.cc @@ -596,7 +596,7 @@ static void add_view_error_cb(GObject* object, g_autoptr(GError) error = nullptr; FlutterViewId view_id = fl_engine_add_view_finish(FL_ENGINE(object), result, &error); - EXPECT_EQ(view_id, 0); + EXPECT_EQ(view_id, -1); EXPECT_NE(error, nullptr); g_main_loop_quit(static_cast(user_data)); @@ -631,7 +631,7 @@ static void add_view_engine_error_cb(GObject* object, g_autoptr(GError) error = nullptr; FlutterViewId view_id = fl_engine_add_view_finish(FL_ENGINE(object), result, &error); - EXPECT_EQ(view_id, 0); + EXPECT_EQ(view_id, -1); EXPECT_NE(error, nullptr); g_main_loop_quit(static_cast(user_data));