Refactor: Make GetImageHandle() Evas GL-only

shell/platform/tizen/tizen_embedder_engine.cc

@@ -53,10 +53,6 @@ TizenEmbedderEngine::TizenEmbedderEngine(
   tizen_renderer = std::make_unique<TizenRendererEvasGL>(
       *this, window_properties.x, window_properties.y, window_properties.width,
       window_properties.height);
-  // clear once to remove noise
-  tizen_renderer->OnMakeCurrent();
-  tizen_renderer->ClearColor(0, 0, 0, 0);
-  tizen_renderer->OnPresent();
 #else
   tizen_renderer = std::make_unique<TizenRendererEcoreWl2>(
       *this, window_properties.x, window_properties.y, window_properties.width,

shell/platform/tizen/tizen_event_loop.cc

@@ -8,12 +8,11 @@
 #include <atomic>
 #include <utility>
 
-#ifdef TIZEN_RENDERER_EVAS_GL
-#include <Evas_GL.h>
-#endif
-
 #include "flutter/shell/platform/tizen/tizen_log.h"
 #include "flutter/shell/platform/tizen/tizen_renderer.h"
+#ifdef TIZEN_RENDERER_EVAS_GL
+#include "flutter/shell/platform/tizen/tizen_renderer_evas_gl.h"
+#endif
 
 TizenEventLoop::TizenEventLoop(std::thread::id main_thread_id,
                                TaskExpiredCallback on_task_expired)
@@ -120,8 +119,9 @@ TizenRenderEventLoop::TizenRenderEventLoop(std::thread::id main_thread_id,
     : TizenEventLoop(main_thread_id, on_task_expired),
       tizen_renderer_(tizen_renderer) {
   evas_object_image_pixels_get_callback_set(
-      (Evas_Object*)tizen_renderer_->GetImageHandle(),
-      [](void* data, Evas_Object* o) {  // Render call back
+      (Evas_Object*)static_cast<TizenRendererEvasGL*>(tizen_renderer_)
+          ->GetImageHandle(),
+      [](void* data, Evas_Object* o) {  // Render callback
         TizenRenderEventLoop* self = (TizenRenderEventLoop*)data;
         {
           std::lock_guard<std::mutex> lock(self->expired_tasks_mutex_);
@@ -141,9 +141,11 @@ void TizenRenderEventLoop::OnTaskExpired() {
   size_t expired_tasks_count = 0;
   std::lock_guard<std::mutex> lock(expired_tasks_mutex_);
   expired_tasks_count = expired_tasks_.size();
-  if (has_pending_renderer_callback_ == false && expired_tasks_count) {
+  if (!has_pending_renderer_callback_ && expired_tasks_count) {
     evas_object_image_pixels_dirty_set(
-        (Evas_Object*)tizen_renderer_->GetImageHandle(), EINA_TRUE);
+        (Evas_Object*)static_cast<TizenRendererEvasGL*>(tizen_renderer_)
+            ->GetImageHandle(),
+        EINA_TRUE);
     has_pending_renderer_callback_ = true;
   } else {
     // Do nothing

shell/platform/tizen/tizen_renderer.h

@@ -32,10 +32,6 @@ class TizenRenderer {
   virtual TizenWindowGeometry GetGeometry() = 0;
   virtual uintptr_t GetWindowId() = 0;
 
-  // TODO: For Evas GL only.
-  virtual void* GetImageHandle() { return nullptr; };
-  virtual void ClearColor(float r, float g, float b, float a){};
-
   virtual void SetRotate(int angle) = 0;
   virtual void ResizeWithRotation(int32_t x, int32_t y, int32_t width,
                                   int32_t height, int32_t degree) = 0;

shell/platform/tizen/tizen_renderer_evas_gl.cc

@@ -15,10 +15,20 @@ TizenRendererEvasGL::TizenRendererEvasGL(TizenRenderer::Delegate& delegate,
                                          int32_t h)
     : TizenRenderer(delegate) {
   InitializeRenderer(x, y, w, h);
+
+  // Clear once to remove noise.
+  OnMakeCurrent();
+  ClearColor(0, 0, 0, 0);
+  OnPresent();
 }
 
 TizenRendererEvasGL::~TizenRendererEvasGL() { DestroyRenderer(); }
 
+void TizenRendererEvasGL::ClearColor(float r, float g, float b, float a) {
+  glClearColor(r, g, b, a);
+  glClear(GL_COLOR_BUFFER_BIT);
+}
+
 bool TizenRendererEvasGL::OnMakeCurrent() {
   if (!IsValid()) {
     FT_LOGE("Invalid TizenRenderer");
@@ -545,11 +555,6 @@ uintptr_t TizenRendererEvasGL::GetWindowId() {
 
 void* TizenRendererEvasGL::GetImageHandle() { return (void*)graphics_adapter_; }
 
-void TizenRendererEvasGL::ClearColor(float r, float g, float b, float a) {
-  glClearColor(r, g, b, a);
-  glClear(GL_COLOR_BUFFER_BIT);
-}
-
 bool TizenRendererEvasGL::InitializeRenderer(int32_t x, int32_t y, int32_t w,
                                              int32_t h) {
   if (!SetupEvasGL(x, y, w, h)) {

shell/platform/tizen/tizen_renderer_evas_gl.h

@@ -31,9 +31,8 @@ class TizenRendererEvasGL : public TizenRenderer {
   void ResizeWithRotation(int32_t x, int32_t y, int32_t width, int32_t height,
                           int32_t angle) override;
   void SetRotate(int angle) override;
-
-  void* GetImageHandle() override;
-  void ClearColor(float r, float g, float b, float a) override;
+
+  void* GetImageHandle();
 
  protected:
   bool InitializeRenderer(int32_t x, int32_t y, int32_t w, int32_t h) override;
@@ -43,6 +42,8 @@ class TizenRendererEvasGL : public TizenRenderer {
   void SendRotationChangeDone() override;
 
  private:
+  void ClearColor(float r, float g, float b, float a);
+
   bool SetupEvasGL(int32_t x, int32_t y, int32_t w, int32_t h);
   void* SetupEvasWindow(int32_t x, int32_t y, int32_t w, int32_t h);
   void DestroyEvasGL();