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

Use GTask integer return APIs and fix documentation on return value on error. (flutter/engine#55353)

Browse Source
This commit is contained in:
Robert Ancell 2024-09-24 13:25:15 +12:00 committed by GitHub
parent ab030d2c39
commit 53b8ece3c8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/src/flutter/shell/platform/linux/fl_engine.cc
View File

@ -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,

2
engine/src/flutter/shell/platform/linux/fl_engine_private.h
View File

@ -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,

4
engine/src/flutter/shell/platform/linux/fl_engine_test.cc
View File

@ -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<GMainLoop*>(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<GMainLoop*>(user_data));