Update based on review

Signed-off-by: Boram Bae <[email protected]>

Author: bbrto21

shell/platform/tizen/flutter_tizen_engine.cc

@@ -49,7 +49,7 @@ FlutterTizenEngine::FlutterTizenEngine(bool headed)
   event_loop_ = std::make_unique<TizenPlatformEventLoop>(
       std::this_thread::get_id(),  // main thread
       [this](const auto* task) {
-        if (embedder_api_.RunTask(this->flutter_engine, task) != kSuccess) {
+        if (embedder_api_.RunTask(this->engine_, task) != kSuccess) {
           FT_LOGE("Could not post an engine task.");
         }
       });
@@ -78,7 +78,7 @@ void FlutterTizenEngine::InitializeRenderer() {
   render_loop_ = std::make_unique<TizenRenderEventLoop>(
       std::this_thread::get_id(),  // main thread
       [this](const auto* task) {
-        if (embedder_api_.RunTask(this->flutter_engine, task) != kSuccess) {
+        if (embedder_api_.RunTask(this->engine_, task) != kSuccess) {
           FT_LOGE("Could not post an engine task.");
         }
       },
@@ -91,7 +91,7 @@ void FlutterTizenEngine::InitializeRenderer() {
 }
 
 void FlutterTizenEngine::NotifyLowMemoryWarning() {
-  embedder_api_.NotifyLowMemoryWarning(flutter_engine);
+  embedder_api_.NotifyLowMemoryWarning(engine_);
 }
 
 // Attempts to load AOT data from the given path, which must be absolute and
@@ -176,7 +176,18 @@ bool FlutterTizenEngine::RunEngine(
   args.icu_data_path = engine_properties.icu_data_path;
   args.command_line_argc = static_cast<int>(argv.size());
   args.command_line_argv = &argv[0];
-  args.platform_message_callback = OnFlutterPlatformMessage;
+  args.platform_message_callback =
+      [](const FlutterPlatformMessage* engine_message, void* user_data) {
+        if (engine_message->struct_size != sizeof(FlutterPlatformMessage)) {
+          FT_LOGE(
+              "Invalid message size received. Expected: %zu, but received %zu",
+              sizeof(FlutterPlatformMessage), engine_message->struct_size);
+          return;
+        }
+        auto engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
+        auto message = engine->ConvertToDesktopMessage(*engine_message);
+        engine->message_dispatcher->HandleMessage(message);
+      };
   args.custom_task_runners = &custom_task_runners;
 #ifndef TIZEN_RENDERER_EVAS_GL
   if (IsHeaded()) {
@@ -199,8 +210,8 @@ bool FlutterTizenEngine::RunEngine(
   FlutterRendererConfig renderer_config = GetRendererConfig();
 
   auto result = embedder_api_.Run(FLUTTER_ENGINE_VERSION, &renderer_config,
-                                  &args, this, &flutter_engine);
-  if (result == kSuccess && flutter_engine != nullptr) {
+                                  &args, this, &engine_);
+  if (result == kSuccess && engine_ != nullptr) {
     FT_LOGD("FlutterEngineRun Success!");
   } else {
     FT_LOGE("FlutterEngineRun Failure! result: %d", result);
@@ -238,15 +249,15 @@ bool FlutterTizenEngine::RunEngine(
 }
 
 bool FlutterTizenEngine::StopEngine() {
-  if (flutter_engine) {
+  if (engine_) {
     if (platform_view_channel) {
       platform_view_channel->Dispose();
     }
     if (plugin_registrar_destruction_callback_) {
       plugin_registrar_destruction_callback_(plugin_registrar_.get());
     }
-    FlutterEngineResult result = embedder_api_.Shutdown(flutter_engine);
-    flutter_engine = nullptr;
+    FlutterEngineResult result = embedder_api_.Shutdown(engine_);
+    engine_ = nullptr;
     return (result == kSuccess);
   }
   return false;
@@ -275,9 +286,9 @@ bool FlutterTizenEngine::SendPlatformMessage(
   if (reply != nullptr && user_data != nullptr) {
     FlutterEngineResult result =
         embedder_api_.PlatformMessageCreateResponseHandle(
-            flutter_engine, reply, user_data, &response_handle);
+            engine_, reply, user_data, &response_handle);
     if (result != kSuccess) {
-      std::cout << "Failed to create response handle\n";
+      FT_LOGE("Failed to create response handle");
       return false;
     }
   }
@@ -291,9 +302,9 @@ bool FlutterTizenEngine::SendPlatformMessage(
   };
 
   FlutterEngineResult message_result =
-      embedder_api_.SendPlatformMessage(flutter_engine, &platform_message);
+      embedder_api_.SendPlatformMessage(engine_, &platform_message);
   if (response_handle != nullptr) {
-    embedder_api_.PlatformMessageReleaseResponseHandle(flutter_engine,
+    embedder_api_.PlatformMessageReleaseResponseHandle(engine_,
                                                        response_handle);
   }
   return message_result == kSuccess;
@@ -303,12 +314,11 @@ void FlutterTizenEngine::SendPlatformMessageResponse(
     const FlutterDesktopMessageResponseHandle* handle,
     const uint8_t* data,
     size_t data_length) {
-  embedder_api_.SendPlatformMessageResponse(flutter_engine, handle, data,
-                                            data_length);
+  embedder_api_.SendPlatformMessageResponse(engine_, handle, data, data_length);
 }
 
 void FlutterTizenEngine::SendPointerEvent(const FlutterPointerEvent& event) {
-  embedder_api_.SendPointerEvent(flutter_engine, &event, 1);
+  embedder_api_.SendPointerEvent(engine_, &event, 1);
 }
 
 void FlutterTizenEngine::SendWindowMetrics(int32_t width,
@@ -339,7 +349,7 @@ void FlutterTizenEngine::SendWindowMetrics(int32_t width,
   } else {
     event.pixel_ratio = pixel_ratio;
   }
-  embedder_api_.SendWindowMetricsEvent(flutter_engine, &event);
+  embedder_api_.SendWindowMetricsEvent(engine_, &event);
 }
 
 // This must be called at least once in order to initialize the value of
@@ -388,44 +398,32 @@ void FlutterTizenEngine::OnOrientationChange(int32_t degree) {
 void FlutterTizenEngine::OnVsync(intptr_t baton,
                                  uint64_t frame_start_time_nanos,
                                  uint64_t frame_target_time_nanos) {
-  embedder_api_.OnVsync(flutter_engine, baton, frame_start_time_nanos,
+  embedder_api_.OnVsync(engine_, baton, frame_start_time_nanos,
                         frame_target_time_nanos);
 }
 
 void FlutterTizenEngine::UpdateLocales(const FlutterLocale** locales,
                                        size_t locales_count) {
-  embedder_api_.UpdateLocales(flutter_engine, locales, locales_count);
+  embedder_api_.UpdateLocales(engine_, locales, locales_count);
 }
 
 bool FlutterTizenEngine::RegisterExternalTexture(int64_t texture_id) {
-  return (embedder_api_.RegisterExternalTexture(flutter_engine, texture_id) ==
+  return (embedder_api_.RegisterExternalTexture(engine_, texture_id) ==
           kSuccess);
 }
 
 bool FlutterTizenEngine::UnregisterExternalTexture(int64_t texture_id) {
-  return (embedder_api_.UnregisterExternalTexture(flutter_engine, texture_id) ==
+  return (embedder_api_.UnregisterExternalTexture(engine_, texture_id) ==
           kSuccess);
 }
 
 bool FlutterTizenEngine::MarkExternalTextureFrameAvailable(int64_t texture_id) {
   return (embedder_api_.MarkExternalTextureFrameAvailable(
-              flutter_engine, texture_id) == kSuccess);
+              engine_, texture_id) == kSuccess);
 }
 
 // The Flutter Engine calls out to this function when new platform messages are
 // available.
-void FlutterTizenEngine::OnFlutterPlatformMessage(
-    const FlutterPlatformMessage* engine_message,
-    void* user_data) {
-  if (engine_message->struct_size != sizeof(FlutterPlatformMessage)) {
-    FT_LOGE("Invalid message size received. Expected: %zu, but received %zu",
-            sizeof(FlutterPlatformMessage), engine_message->struct_size);
-    return;
-  }
-  auto engine = reinterpret_cast<FlutterTizenEngine*>(user_data);
-  auto message = engine->ConvertToDesktopMessage(*engine_message);
-  engine->message_dispatcher->HandleMessage(message);
-}
 
 // Converts a FlutterPlatformMessage to an equivalent FlutterDesktopMessage.
 FlutterDesktopMessage FlutterTizenEngine::ConvertToDesktopMessage(

shell/platform/tizen/flutter_tizen_engine.h

@@ -67,21 +67,17 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
   FlutterTizenEngine& operator=(FlutterTizenEngine const&) = delete;
 
   void InitializeRenderer();
-
   void NotifyLowMemoryWarning();
-
   bool RunEngine(const FlutterDesktopEngineProperties& engine_properties);
   bool StopEngine();
 
   // Returns the currently configured Plugin Registrar.
   FlutterDesktopPluginRegistrarRef GetPluginRegistrar();
-
   FlutterTizenTextureRegistrar* GetTextureRegistrar();
 
   // Sets |callback| to be called when the plugin registrar is destroyed.
   void SetPluginRegistrarDestructionCallback(
       FlutterDesktopOnPluginRegistrarDestroyed callback);
-
   bool SendPlatformMessage(const char* channel,
                            const uint8_t* message,
                            const size_t message_size,
@@ -127,19 +123,15 @@ class FlutterTizenEngine : public TizenRenderer::Delegate {
 
  private:
   bool IsHeaded() { return renderer != nullptr; }
-
-  static void OnFlutterPlatformMessage(
-      const FlutterPlatformMessage* engine_message,
-      void* user_data);
+  UniqueAotDataPtr LoadAotData(std::string aot_data_path);
   FlutterDesktopMessage ConvertToDesktopMessage(
       const FlutterPlatformMessage& engine_message);
   FlutterRendererConfig GetRendererConfig();
-  UniqueAotDataPtr LoadAotData(std::string aot_data_path);
 
   FlutterEngineProcTable embedder_api_ = {};
 
   // The Flutter engine instance.
-  FLUTTER_API_SYMBOL(FlutterEngine) flutter_engine;
+  FLUTTER_API_SYMBOL(FlutterEngine) engine_;
 
   // The handlers listening to platform events.
   std::unique_ptr<KeyEventHandler> key_event_handler_;