From 593575383cd6eb60185dccbd5801503990018f4b Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Sat, 18 Sep 2021 20:45:12 +0800 Subject: [PATCH 1/9] Add get ecore window interface. --- shell/platform/tizen/tizen_renderer.h | 1 + shell/platform/tizen/tizen_renderer_ecore_wl2.cc | 2 ++ shell/platform/tizen/tizen_renderer_ecore_wl2.h | 1 + shell/platform/tizen/tizen_renderer_evas_gl.cc | 4 ++++ shell/platform/tizen/tizen_renderer_evas_gl.h | 1 + 5 files changed, 9 insertions(+) diff --git a/shell/platform/tizen/tizen_renderer.h b/shell/platform/tizen/tizen_renderer.h index 89cf5157152ca..215f580c7af33 100644 --- a/shell/platform/tizen/tizen_renderer.h +++ b/shell/platform/tizen/tizen_renderer.h @@ -29,6 +29,7 @@ class TizenRenderer { bool IsValid() { return is_valid_; } + virtual void* GetRenderTarget() = 0; virtual bool OnMakeCurrent() = 0; virtual bool OnClearCurrent() = 0; virtual bool OnMakeResourceCurrent() = 0; diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc index 89d72425bad00..e3a3175625643 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc @@ -625,6 +625,8 @@ void TizenRendererEcoreWl2::SetTizenPolicyNotificationLevel(int level) { tizen_policy_set_notification_level( tizen_policy_, ecore_wl2_window_surface_get(ecore_wl2_window_), level); +void* TizenRendererEcoreWl2::GetRenderTarget() { + return ecore_wl2_window_; } } // namespace flutter diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.h b/shell/platform/tizen/tizen_renderer_ecore_wl2.h index c9316d68b533e..e590933ff35c8 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.h +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.h @@ -25,6 +25,7 @@ class TizenRendererEcoreWl2 : public TizenRenderer { Delegate& delegate); virtual ~TizenRendererEcoreWl2(); + void* GetRenderTarget() override; bool OnMakeCurrent() override; bool OnClearCurrent() override; bool OnMakeResourceCurrent() override; diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.cc b/shell/platform/tizen/tizen_renderer_evas_gl.cc index 445c8d6bcd2ec..197f6be5c0cfb 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.cc +++ b/shell/platform/tizen/tizen_renderer_evas_gl.cc @@ -771,4 +771,8 @@ bool TizenRendererEvasGL::IsSupportedExtention(const char* name) { return strcmp(name, "EGL_TIZEN_image_native_surface") == 0; } +void* TizenRendererEvasGL::GetRenderTarget() { + return evas_window_; +} + } // namespace flutter diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.h b/shell/platform/tizen/tizen_renderer_evas_gl.h index 22f868cc44173..763d6e806474b 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.h +++ b/shell/platform/tizen/tizen_renderer_evas_gl.h @@ -23,6 +23,7 @@ class TizenRendererEvasGL : public TizenRenderer { Delegate& delegate); virtual ~TizenRendererEvasGL(); + void* GetRenderTarget() override; bool OnMakeCurrent() override; bool OnClearCurrent() override; bool OnMakeResourceCurrent() override; From 41915372e89e9dba0e828affc1e77ea28c588880 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Wed, 22 Sep 2021 18:24:52 +0800 Subject: [PATCH 2/9] Change get window method name --- shell/platform/tizen/flutter_tizen.cc | 9 +++++++++ shell/platform/tizen/public/flutter_tizen.h | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/shell/platform/tizen/flutter_tizen.cc b/shell/platform/tizen/flutter_tizen.cc index c55dde5204c71..456afa4705714 100644 --- a/shell/platform/tizen/flutter_tizen.cc +++ b/shell/platform/tizen/flutter_tizen.cc @@ -77,6 +77,15 @@ void FlutterDesktopShutdownEngine(FlutterDesktopEngineRef engine_ref) { delete engine; } +void* FlutterDesktopViewGetWindow(FlutterDesktopViewRef view) { + return ViewFromHandle(view)->GetRenderTarget(); +} + +FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView( + FlutterDesktopPluginRegistrarRef registrar) { + return HandleForView(registrar->engine->renderer()); +} + void FlutterDesktopPluginRegistrarEnableInputBlocking( FlutterDesktopPluginRegistrarRef registrar, const char* channel) { diff --git a/shell/platform/tizen/public/flutter_tizen.h b/shell/platform/tizen/public/flutter_tizen.h index 0f14c8914b91b..92f8b0c353046 100644 --- a/shell/platform/tizen/public/flutter_tizen.h +++ b/shell/platform/tizen/public/flutter_tizen.h @@ -91,6 +91,13 @@ FlutterDesktopGetPluginRegistrar(FlutterDesktopEngineRef engine, FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine); +// Return backing elm window for manipulation in host application. +FLUTTER_EXPORT void* FlutterDesktopViewGetWindow(FlutterDesktopViewRef view); + +// Returns the view associated with this registrar's engine instance. +FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView( + FlutterDesktopPluginRegistrarRef registrar); + // Posts an app control to the engine instance. FLUTTER_EXPORT void FlutterDesktopNotifyAppControl( FlutterDesktopEngineRef engine, From 04f5d4977fa841ce62036314b5b4a7b32ef9623c Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Fri, 22 Oct 2021 20:57:38 +0800 Subject: [PATCH 3/9] Fix build error --- shell/platform/tizen/flutter_tizen.cc | 10 ++++++++++ shell/platform/tizen/public/flutter_tizen.h | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/shell/platform/tizen/flutter_tizen.cc b/shell/platform/tizen/flutter_tizen.cc index 456afa4705714..0856db212b257 100644 --- a/shell/platform/tizen/flutter_tizen.cc +++ b/shell/platform/tizen/flutter_tizen.cc @@ -39,6 +39,16 @@ FlutterDesktopTextureRegistrarRef HandleForTextureRegistrar( } // namespace +// Returns the view corresponding to the given opaque API handle. +static flutter::TizenRenderer* ViewFromHandle(FlutterDesktopViewRef ref) { + return reinterpret_cast(ref); +} + +// Returns the opaque API handle for the given view instance. +static FlutterDesktopViewRef HandleForView(flutter::TizenRenderer* view) { + return reinterpret_cast(view); +} + FlutterDesktopEngineRef FlutterDesktopRunEngine( const FlutterDesktopWindowProperties& window_properties, const FlutterDesktopEngineProperties& engine_properties) { diff --git a/shell/platform/tizen/public/flutter_tizen.h b/shell/platform/tizen/public/flutter_tizen.h index 92f8b0c353046..9d2e87f3c4eb6 100644 --- a/shell/platform/tizen/public/flutter_tizen.h +++ b/shell/platform/tizen/public/flutter_tizen.h @@ -17,6 +17,10 @@ extern "C" { #endif +// Opaque reference to a Flutter window. +struct FlutterDesktopView; +typedef struct FlutterDesktopView* FlutterDesktopViewRef; + // Opaque reference to a Flutter engine instance. struct FlutterDesktopEngine; typedef struct FlutterDesktopEngine* FlutterDesktopEngineRef; @@ -87,6 +91,8 @@ FLUTTER_EXPORT FlutterDesktopPluginRegistrarRef FlutterDesktopGetPluginRegistrar(FlutterDesktopEngineRef engine, const char* plugin_name); +// ========== View ========== + // Returns the messenger associated with the engine. FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine); From 77446cc5117837b2de53f08baa6d2fc2fb11ec29 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Tue, 16 Nov 2021 22:51:15 +0800 Subject: [PATCH 4/9] Fix build error --- shell/platform/tizen/tizen_renderer_ecore_wl2.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc index e3a3175625643..078af82433fe7 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc @@ -625,6 +625,8 @@ void TizenRendererEcoreWl2::SetTizenPolicyNotificationLevel(int level) { tizen_policy_set_notification_level( tizen_policy_, ecore_wl2_window_surface_get(ecore_wl2_window_), level); +} + void* TizenRendererEcoreWl2::GetRenderTarget() { return ecore_wl2_window_; } From 57e934d7f3e4584830ef9cd9001557dab4080651 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Thu, 18 Nov 2021 01:52:15 +0800 Subject: [PATCH 5/9] Add comment for getting window interface --- shell/platform/tizen/public/flutter_tizen.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shell/platform/tizen/public/flutter_tizen.h b/shell/platform/tizen/public/flutter_tizen.h index 9d2e87f3c4eb6..e45be7b8cc325 100644 --- a/shell/platform/tizen/public/flutter_tizen.h +++ b/shell/platform/tizen/public/flutter_tizen.h @@ -97,7 +97,12 @@ FlutterDesktopGetPluginRegistrar(FlutterDesktopEngineRef engine, FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine); -// Return backing elm window for manipulation in host application. +/** + * Return backing window for manipulation in host application. + * + * If run engine on a wearable device, need cast void* to Evas_Objct*, + * otherwise cast void* to Ecore_Wl2_Window*. + */ FLUTTER_EXPORT void* FlutterDesktopViewGetWindow(FlutterDesktopViewRef view); // Returns the view associated with this registrar's engine instance. From 1a7bea2d1907bba1c11b0decd93512dfbc5d40d7 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Thu, 18 Nov 2021 02:07:30 +0800 Subject: [PATCH 6/9] Remove not used code --- shell/platform/tizen/public/flutter_tizen.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/shell/platform/tizen/public/flutter_tizen.h b/shell/platform/tizen/public/flutter_tizen.h index e45be7b8cc325..9f26076a5fd63 100644 --- a/shell/platform/tizen/public/flutter_tizen.h +++ b/shell/platform/tizen/public/flutter_tizen.h @@ -91,8 +91,6 @@ FLUTTER_EXPORT FlutterDesktopPluginRegistrarRef FlutterDesktopGetPluginRegistrar(FlutterDesktopEngineRef engine, const char* plugin_name); -// ========== View ========== - // Returns the messenger associated with the engine. FLUTTER_EXPORT FlutterDesktopMessengerRef FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine); From 07f58e4304077ae9877f14b41438eac50ef34b5a Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Fri, 19 Nov 2021 23:21:02 +0800 Subject: [PATCH 7/9] Change interface name 1.Change interface name, make it more clearly. 2.Move HandleForRender and RendererFromHandle to unnamed namspace. --- shell/platform/tizen/flutter_tizen.cc | 22 +++++++++---------- shell/platform/tizen/public/flutter_tizen.h | 14 +++++++----- shell/platform/tizen/tizen_renderer.h | 2 +- .../tizen/tizen_renderer_ecore_wl2.cc | 2 +- .../platform/tizen/tizen_renderer_ecore_wl2.h | 2 +- .../platform/tizen/tizen_renderer_evas_gl.cc | 2 +- shell/platform/tizen/tizen_renderer_evas_gl.h | 2 +- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/shell/platform/tizen/flutter_tizen.cc b/shell/platform/tizen/flutter_tizen.cc index 0856db212b257..00367ac5511b6 100644 --- a/shell/platform/tizen/flutter_tizen.cc +++ b/shell/platform/tizen/flutter_tizen.cc @@ -37,18 +37,18 @@ FlutterDesktopTextureRegistrarRef HandleForTextureRegistrar( return reinterpret_cast(registrar); } -} // namespace - -// Returns the view corresponding to the given opaque API handle. -static flutter::TizenRenderer* ViewFromHandle(FlutterDesktopViewRef ref) { +// Returns the renderer corresponding to the given opaque API handle. +flutter::TizenRenderer* RendererFromHandle(FlutterDesktopRendererRef ref) { return reinterpret_cast(ref); } -// Returns the opaque API handle for the given view instance. -static FlutterDesktopViewRef HandleForView(flutter::TizenRenderer* view) { - return reinterpret_cast(view); +// Returns the opaque API handle for the given renderer instance. +FlutterDesktopRendererRef HandleForRenderer(flutter::TizenRenderer* renderer) { + return reinterpret_cast(renderer); } +} // namespace + FlutterDesktopEngineRef FlutterDesktopRunEngine( const FlutterDesktopWindowProperties& window_properties, const FlutterDesktopEngineProperties& engine_properties) { @@ -87,13 +87,13 @@ void FlutterDesktopShutdownEngine(FlutterDesktopEngineRef engine_ref) { delete engine; } -void* FlutterDesktopViewGetWindow(FlutterDesktopViewRef view) { - return ViewFromHandle(view)->GetRenderTarget(); +void* FlutterDesktopRendererGetWindow(FlutterDesktopRendererRef renderer) { + return RendererFromHandle(renderer)->GetWindow(); } -FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView( +FlutterDesktopRendererRef FlutterDesktopPluginRegistrarGetRenderer( FlutterDesktopPluginRegistrarRef registrar) { - return HandleForView(registrar->engine->renderer()); + return HandleForRenderer(registrar->engine->renderer()); } void FlutterDesktopPluginRegistrarEnableInputBlocking( diff --git a/shell/platform/tizen/public/flutter_tizen.h b/shell/platform/tizen/public/flutter_tizen.h index 9f26076a5fd63..e1206223e695f 100644 --- a/shell/platform/tizen/public/flutter_tizen.h +++ b/shell/platform/tizen/public/flutter_tizen.h @@ -17,9 +17,9 @@ extern "C" { #endif -// Opaque reference to a Flutter window. -struct FlutterDesktopView; -typedef struct FlutterDesktopView* FlutterDesktopViewRef; +// Opaque reference to a Flutter renderer. +struct FlutterDesktopRenderer; +typedef struct FlutterDesktopRenderer* FlutterDesktopRendererRef; // Opaque reference to a Flutter engine instance. struct FlutterDesktopEngine; @@ -101,10 +101,12 @@ FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine); * If run engine on a wearable device, need cast void* to Evas_Objct*, * otherwise cast void* to Ecore_Wl2_Window*. */ -FLUTTER_EXPORT void* FlutterDesktopViewGetWindow(FlutterDesktopViewRef view); +FLUTTER_EXPORT void* FlutterDesktopRendererGetWindow( + FlutterDesktopRendererRef renderer); -// Returns the view associated with this registrar's engine instance. -FLUTTER_EXPORT FlutterDesktopViewRef FlutterDesktopPluginRegistrarGetView( +// Returns the renderer associated with this registrar's engine instance. +FLUTTER_EXPORT FlutterDesktopRendererRef +FlutterDesktopPluginRegistrarGetRenderer( FlutterDesktopPluginRegistrarRef registrar); // Posts an app control to the engine instance. diff --git a/shell/platform/tizen/tizen_renderer.h b/shell/platform/tizen/tizen_renderer.h index 215f580c7af33..062eb0be6c5ca 100644 --- a/shell/platform/tizen/tizen_renderer.h +++ b/shell/platform/tizen/tizen_renderer.h @@ -29,7 +29,7 @@ class TizenRenderer { bool IsValid() { return is_valid_; } - virtual void* GetRenderTarget() = 0; + virtual void* GetWindow() = 0; virtual bool OnMakeCurrent() = 0; virtual bool OnClearCurrent() = 0; virtual bool OnMakeResourceCurrent() = 0; diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc index 078af82433fe7..1a1dec63a8b30 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc @@ -627,7 +627,7 @@ void TizenRendererEcoreWl2::SetTizenPolicyNotificationLevel(int level) { tizen_policy_, ecore_wl2_window_surface_get(ecore_wl2_window_), level); } -void* TizenRendererEcoreWl2::GetRenderTarget() { +void* TizenRendererEcoreWl2::GetWindow() { return ecore_wl2_window_; } diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.h b/shell/platform/tizen/tizen_renderer_ecore_wl2.h index e590933ff35c8..01054ea3c7e9f 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.h +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.h @@ -25,7 +25,7 @@ class TizenRendererEcoreWl2 : public TizenRenderer { Delegate& delegate); virtual ~TizenRendererEcoreWl2(); - void* GetRenderTarget() override; + void* GetWindow() override; bool OnMakeCurrent() override; bool OnClearCurrent() override; bool OnMakeResourceCurrent() override; diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.cc b/shell/platform/tizen/tizen_renderer_evas_gl.cc index 197f6be5c0cfb..b3001708aa907 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.cc +++ b/shell/platform/tizen/tizen_renderer_evas_gl.cc @@ -771,7 +771,7 @@ bool TizenRendererEvasGL::IsSupportedExtention(const char* name) { return strcmp(name, "EGL_TIZEN_image_native_surface") == 0; } -void* TizenRendererEvasGL::GetRenderTarget() { +void* TizenRendererEvasGL::GetWindow() { return evas_window_; } diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.h b/shell/platform/tizen/tizen_renderer_evas_gl.h index 763d6e806474b..855c6172e505b 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.h +++ b/shell/platform/tizen/tizen_renderer_evas_gl.h @@ -23,7 +23,7 @@ class TizenRendererEvasGL : public TizenRenderer { Delegate& delegate); virtual ~TizenRendererEvasGL(); - void* GetRenderTarget() override; + void* GetWindow() override; bool OnMakeCurrent() override; bool OnClearCurrent() override; bool OnMakeResourceCurrent() override; From 82e40b57100b93df614de3e771b9fb289102e490 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Mon, 22 Nov 2021 22:24:56 +0800 Subject: [PATCH 8/9] Get window from FlutterDesktopPluginRegistrarRef --- shell/platform/tizen/flutter_tizen.cc | 19 ++----------------- shell/platform/tizen/public/flutter_tizen.h | 11 +---------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/shell/platform/tizen/flutter_tizen.cc b/shell/platform/tizen/flutter_tizen.cc index 00367ac5511b6..76ce270ecc1d3 100644 --- a/shell/platform/tizen/flutter_tizen.cc +++ b/shell/platform/tizen/flutter_tizen.cc @@ -37,16 +37,6 @@ FlutterDesktopTextureRegistrarRef HandleForTextureRegistrar( return reinterpret_cast(registrar); } -// Returns the renderer corresponding to the given opaque API handle. -flutter::TizenRenderer* RendererFromHandle(FlutterDesktopRendererRef ref) { - return reinterpret_cast(ref); -} - -// Returns the opaque API handle for the given renderer instance. -FlutterDesktopRendererRef HandleForRenderer(flutter::TizenRenderer* renderer) { - return reinterpret_cast(renderer); -} - } // namespace FlutterDesktopEngineRef FlutterDesktopRunEngine( @@ -87,13 +77,8 @@ void FlutterDesktopShutdownEngine(FlutterDesktopEngineRef engine_ref) { delete engine; } -void* FlutterDesktopRendererGetWindow(FlutterDesktopRendererRef renderer) { - return RendererFromHandle(renderer)->GetWindow(); -} - -FlutterDesktopRendererRef FlutterDesktopPluginRegistrarGetRenderer( - FlutterDesktopPluginRegistrarRef registrar) { - return HandleForRenderer(registrar->engine->renderer()); +void* FlutterDesktopGetWindow(FlutterDesktopPluginRegistrarRef registrar) { + return registrar->engine->renderer()->GetWindow(); } void FlutterDesktopPluginRegistrarEnableInputBlocking( diff --git a/shell/platform/tizen/public/flutter_tizen.h b/shell/platform/tizen/public/flutter_tizen.h index e1206223e695f..1e423ac3ec1dd 100644 --- a/shell/platform/tizen/public/flutter_tizen.h +++ b/shell/platform/tizen/public/flutter_tizen.h @@ -17,10 +17,6 @@ extern "C" { #endif -// Opaque reference to a Flutter renderer. -struct FlutterDesktopRenderer; -typedef struct FlutterDesktopRenderer* FlutterDesktopRendererRef; - // Opaque reference to a Flutter engine instance. struct FlutterDesktopEngine; typedef struct FlutterDesktopEngine* FlutterDesktopEngineRef; @@ -101,12 +97,7 @@ FlutterDesktopEngineGetMessenger(FlutterDesktopEngineRef engine); * If run engine on a wearable device, need cast void* to Evas_Objct*, * otherwise cast void* to Ecore_Wl2_Window*. */ -FLUTTER_EXPORT void* FlutterDesktopRendererGetWindow( - FlutterDesktopRendererRef renderer); - -// Returns the renderer associated with this registrar's engine instance. -FLUTTER_EXPORT FlutterDesktopRendererRef -FlutterDesktopPluginRegistrarGetRenderer( +FLUTTER_EXPORT void* FlutterDesktopGetWindow( FlutterDesktopPluginRegistrarRef registrar); // Posts an app control to the engine instance. From 91367630a99af9e1f7de120c4eb9164f7544ccd1 Mon Sep 17 00:00:00 2001 From: xiaowei guan Date: Tue, 23 Nov 2021 17:06:39 +0800 Subject: [PATCH 9/9] Merge GetWindow and GetWindowHandle --- shell/platform/tizen/flutter_tizen.cc | 2 +- shell/platform/tizen/tizen_renderer.h | 1 - shell/platform/tizen/tizen_renderer_ecore_wl2.cc | 4 ---- shell/platform/tizen/tizen_renderer_ecore_wl2.h | 1 - shell/platform/tizen/tizen_renderer_evas_gl.cc | 6 +----- shell/platform/tizen/tizen_renderer_evas_gl.h | 1 - 6 files changed, 2 insertions(+), 13 deletions(-) diff --git a/shell/platform/tizen/flutter_tizen.cc b/shell/platform/tizen/flutter_tizen.cc index 76ce270ecc1d3..3218f43431694 100644 --- a/shell/platform/tizen/flutter_tizen.cc +++ b/shell/platform/tizen/flutter_tizen.cc @@ -78,7 +78,7 @@ void FlutterDesktopShutdownEngine(FlutterDesktopEngineRef engine_ref) { } void* FlutterDesktopGetWindow(FlutterDesktopPluginRegistrarRef registrar) { - return registrar->engine->renderer()->GetWindow(); + return registrar->engine->renderer()->GetWindowHandle(); } void FlutterDesktopPluginRegistrarEnableInputBlocking( diff --git a/shell/platform/tizen/tizen_renderer.h b/shell/platform/tizen/tizen_renderer.h index 062eb0be6c5ca..89cf5157152ca 100644 --- a/shell/platform/tizen/tizen_renderer.h +++ b/shell/platform/tizen/tizen_renderer.h @@ -29,7 +29,6 @@ class TizenRenderer { bool IsValid() { return is_valid_; } - virtual void* GetWindow() = 0; virtual bool OnMakeCurrent() = 0; virtual bool OnClearCurrent() = 0; virtual bool OnMakeResourceCurrent() = 0; diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc index 1a1dec63a8b30..89d72425bad00 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.cc +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.cc @@ -627,8 +627,4 @@ void TizenRendererEcoreWl2::SetTizenPolicyNotificationLevel(int level) { tizen_policy_, ecore_wl2_window_surface_get(ecore_wl2_window_), level); } -void* TizenRendererEcoreWl2::GetWindow() { - return ecore_wl2_window_; -} - } // namespace flutter diff --git a/shell/platform/tizen/tizen_renderer_ecore_wl2.h b/shell/platform/tizen/tizen_renderer_ecore_wl2.h index 01054ea3c7e9f..c9316d68b533e 100644 --- a/shell/platform/tizen/tizen_renderer_ecore_wl2.h +++ b/shell/platform/tizen/tizen_renderer_ecore_wl2.h @@ -25,7 +25,6 @@ class TizenRendererEcoreWl2 : public TizenRenderer { Delegate& delegate); virtual ~TizenRendererEcoreWl2(); - void* GetWindow() override; bool OnMakeCurrent() override; bool OnClearCurrent() override; bool OnMakeResourceCurrent() override; diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.cc b/shell/platform/tizen/tizen_renderer_evas_gl.cc index b3001708aa907..8eb235932c2e1 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.cc +++ b/shell/platform/tizen/tizen_renderer_evas_gl.cc @@ -576,7 +576,7 @@ uintptr_t TizenRendererEvasGL::GetWindowId() { } void* TizenRendererEvasGL::GetWindowHandle() { - return nullptr; + return evas_window_; } Evas_Object* TizenRendererEvasGL::GetImageHandle() { @@ -771,8 +771,4 @@ bool TizenRendererEvasGL::IsSupportedExtention(const char* name) { return strcmp(name, "EGL_TIZEN_image_native_surface") == 0; } -void* TizenRendererEvasGL::GetWindow() { - return evas_window_; -} - } // namespace flutter diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.h b/shell/platform/tizen/tizen_renderer_evas_gl.h index 855c6172e505b..22f868cc44173 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.h +++ b/shell/platform/tizen/tizen_renderer_evas_gl.h @@ -23,7 +23,6 @@ class TizenRendererEvasGL : public TizenRenderer { Delegate& delegate); virtual ~TizenRendererEvasGL(); - void* GetWindow() override; bool OnMakeCurrent() override; bool OnClearCurrent() override; bool OnMakeResourceCurrent() override;