Remove FlTaskExecutor

Author: knopp

shell/platform/linux/fl_engine.cc

@@ -350,15 +350,10 @@ G_MODULE_EXPORT FlEngine* fl_engine_new_headless(FlDartProject* project) {
   return fl_engine_new(project, FL_RENDERER(renderer));
 }
 
-static void fl_engine_execute_task(FlutterTask task, gpointer user_data) {
-  FlEngine* self = FL_ENGINE(user_data);
-  self->embedder_api.RunTask(self->engine, &task);
-}
-
 gboolean fl_engine_start(FlEngine* self, GError** error) {
   g_return_val_if_fail(FL_IS_ENGINE(self), FALSE);
 
-  self->task_runner = fl_task_runner_new(fl_engine_execute_task, self);
+  self->task_runner = fl_task_runner_new(self);
 
   FlutterRendererConfig config = {};
   config.type = kOpenGL;
@@ -677,3 +672,7 @@ FlTaskRunner* fl_engine_get_task_runner(FlEngine* self) {
   g_return_val_if_fail(FL_IS_ENGINE(self), nullptr);
   return self->task_runner;
 }
+
+void fl_engine_execute_task(FlEngine* self, FlutterTask* task) {
+  self->embedder_api.RunTask(self->engine, task);
+}

shell/platform/linux/fl_engine_private.h

@@ -236,6 +236,15 @@ GBytes* fl_engine_send_platform_message_finish(FlEngine* engine,
  */
 FlTaskRunner* fl_engine_get_task_runner(FlEngine* engine);
 
+/**
+ * fl_engine_execute_task:
+ * @engine: an #FlEngine.
+ * @task: a #FlutterTask to execute.
+ *
+ * Executes given Flutter task.
+ */
+void fl_engine_execute_task(FlEngine* engine, FlutterTask* task);
+
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_ENGINE_PRIVATE_H_

shell/platform/linux/fl_task_runner.cc

@@ -3,15 +3,15 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/platform/linux/fl_task_runner.h"
+#include "flutter/shell/platform/linux/fl_engine_private.h"
 
 static constexpr int kMicrosecondsPerNanosecond = 1000;
 static constexpr int kMillisecondsPerMicrosecond = 1000;
 
 struct _FlTaskRunner {
   GObject parent_instance;
 
-  FlTaskExecutor executor;
-  gpointer executor_user_data;
+  FlEngine* engine;
 
   GMutex mutex;
   GCond cond;
@@ -42,13 +42,24 @@ static void fl_task_runner_init(FlTaskRunner* self) {
   g_cond_init(&self->cond);
 }
 
+static void engine_weak_notify_cb(gpointer user_data,
+                                  GObject* where_the_object_was) {
+  FlTaskRunner* self = FL_TASK_RUNNER(user_data);
+  self->engine = nullptr;
+}
+
 void fl_task_runner_dispose(GObject* object) {
   FlTaskRunner* self = FL_TASK_RUNNER(object);
 
   // this should never happen because the task runner is retained while blocking
   // main thread
   g_assert(!self->blocking_main_thread);
 
+  if (self->engine != nullptr) {
+    g_object_weak_unref(G_OBJECT(self->engine), engine_weak_notify_cb, self);
+    self->engine = nullptr;
+  }
+
   g_mutex_clear(&self->mutex);
   g_cond_clear(&self->cond);
 
@@ -60,12 +71,11 @@ void fl_task_runner_dispose(GObject* object) {
   G_OBJECT_CLASS(fl_task_runner_parent_class)->dispose(object);
 }
 
-FlTaskRunner* fl_task_runner_new(FlTaskExecutor executor,
-                                 gpointer executor_user_data) {
+FlTaskRunner* fl_task_runner_new(FlEngine* engine) {
   FlTaskRunner* res =
       FL_TASK_RUNNER(g_object_new(fl_task_runner_get_type(), nullptr));
-  res->executor = executor;
-  res->executor_user_data = executor_user_data;
+  res->engine = engine;
+  g_object_weak_ref(G_OBJECT(engine), engine_weak_notify_cb, res);
   return res;
 }
 
@@ -91,11 +101,13 @@ static void fl_task_runner_process_expired_tasks_locked(FlTaskRunner* self) {
 
   g_mutex_unlock(&self->mutex);
 
-  l = expired_tasks;
-  while (l != nullptr && !self->stopped) {
-    FlTaskRunnerTask* task = static_cast<FlTaskRunnerTask*>(l->data);
-    self->executor(task->task, self->executor_user_data);
-    l = l->next;
+  if (self->engine) {
+    l = expired_tasks;
+    while (l != nullptr && !self->stopped) {
+      FlTaskRunnerTask* task = static_cast<FlTaskRunnerTask*>(l->data);
+      fl_engine_execute_task(self->engine, &task->task);
+      l = l->next;
+    }
   }
 
   g_list_free_full(expired_tasks, g_free);

shell/platform/linux/fl_task_runner.h

@@ -8,6 +8,7 @@
 #include <glib-object.h>
 
 #include "flutter/shell/platform/embedder/embedder.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h"
 
 G_BEGIN_DECLS
 
@@ -24,8 +25,7 @@ typedef void (*FlTaskExecutor)(FlutterTask task, gpointer user_data);
  *
  * Returns: an #FlTaskRunner.
  */
-FlTaskRunner* fl_task_runner_new(FlTaskExecutor executor,
-                                 gpointer executor_user_data);
+FlTaskRunner* fl_task_runner_new(FlEngine* engine);
 
 /**
  * fl_task_runner_post_task: