From cb01ad93b755f939dbea89dc1eadf15caeab0e78 Mon Sep 17 00:00:00 2001
From: xiaowei guan <xiaowei.guan@samsung.com>
Date: Fri, 25 Dec 2020 17:49:09 +0800
Subject: [PATCH 1/2] Remove not used code

1.Remove visibility change call back which not used in text input.
2.Remove not used parameter from RegisterIMFcallback.
---
 shell/platform/tizen/channels/text_input_channel.cc | 4 ++--
 shell/platform/tizen/channels/text_input_channel.h  | 2 +-
 shell/platform/tizen/touch_event_handler.cc         | 7 -------
 shell/platform/tizen/touch_event_handler.h          | 3 ---
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/shell/platform/tizen/channels/text_input_channel.cc b/shell/platform/tizen/channels/text_input_channel.cc
index 554eeff693bab..f93dd84ad6e76 100644
--- a/shell/platform/tizen/channels/text_input_channel.cc
+++ b/shell/platform/tizen/channels/text_input_channel.cc
@@ -300,7 +300,7 @@ TextInputChannel::TextInputChannel(flutter::BinaryMessenger* messenger,
         engine_->tizen_native_window->GetWindowHandle();
     ecore_imf_context_client_window_set(
         imfContext_, (void*)ecore_wl2_window_id_get(ecoreWindow));
-    RegisterIMFCallback(ecoreWindow);
+    RegisterIMFCallback();
   } else {
     LoggerE("Failed to create imfContext");
   }
@@ -636,7 +636,7 @@ void TextInputChannel::HideSoftwareKeyboard() {
   }
 }
 
-void TextInputChannel::RegisterIMFCallback(Ecore_Wl2_Window* ecoreWindow) {
+void TextInputChannel::RegisterIMFCallback() {
   // ecore_imf_context_input_panel_enabled_set(imfContext_, false);
   ecore_imf_context_event_callback_add(imfContext_, ECORE_IMF_CALLBACK_COMMIT,
                                        CommitCallback, this);
diff --git a/shell/platform/tizen/channels/text_input_channel.h b/shell/platform/tizen/channels/text_input_channel.h
index 539dd9fb9babb..53cb6e326cb4a 100644
--- a/shell/platform/tizen/channels/text_input_channel.h
+++ b/shell/platform/tizen/channels/text_input_channel.h
@@ -47,7 +47,7 @@ class TextInputChannel {
   void NonIMFFallback(Ecore_Event_Key* keyDownEvent);
   void EnterPressed(flutter::TextInputModel* model);
   void SelectPressed(flutter::TextInputModel* model);
-  void RegisterIMFCallback(Ecore_Wl2_Window* ecoreWindow);
+  void RegisterIMFCallback();
   void UnregisterIMFCallback();
 
   std::unique_ptr<flutter::MethodChannel<rapidjson::Document>> channel_;
diff --git a/shell/platform/tizen/touch_event_handler.cc b/shell/platform/tizen/touch_event_handler.cc
index 46e7fb0869944..561f504915abc 100644
--- a/shell/platform/tizen/touch_event_handler.cc
+++ b/shell/platform/tizen/touch_event_handler.cc
@@ -20,8 +20,6 @@ TouchEventHandler::TouchEventHandler(TizenEmbedderEngine *engine)
       ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, OnTouch, this));
   touch_event_handlers_.push_back(
       ecore_event_handler_add(ECORE_EVENT_MOUSE_MOVE, OnTouch, this));
-  touch_event_handlers_.push_back(ecore_event_handler_add(
-      ECORE_WL2_EVENT_WINDOW_VISIBILITY_CHANGE, OnTouch, this));
 }
 
 TouchEventHandler::~TouchEventHandler() {
@@ -89,11 +87,6 @@ Eina_Bool TouchEventHandler::OnTouch(void *data, int type, void *event) {
       self->SendFlutterPointerEvent(kMove, move_event->x, move_event->y, 0, 0,
                                     move_event->timestamp);
     }
-  } else if (type == ECORE_WL2_EVENT_WINDOW_VISIBILITY_CHANGE) {
-    auto *focus_event =
-        reinterpret_cast<Ecore_Wl2_Event_Window_Visibility_Change *>(event);
-    LoggerD("Visibility changed: %u, %d", focus_event->win,
-            focus_event->fully_obscured);
   } else if (type == ECORE_EVENT_MOUSE_WHEEL) {
     auto *wheel_event = reinterpret_cast<Ecore_Event_Mouse_Wheel *>(event);
     double scroll_delta_x = 0.0, scroll_delta_y = 0.0;
diff --git a/shell/platform/tizen/touch_event_handler.h b/shell/platform/tizen/touch_event_handler.h
index 7990c60714b07..daa1f014aed0b 100644
--- a/shell/platform/tizen/touch_event_handler.h
+++ b/shell/platform/tizen/touch_event_handler.h
@@ -5,10 +5,7 @@
 #ifndef EMBEDDER_TOUCH_EVENT_HANDLER_H_
 #define EMBEDDER_TOUCH_EVENT_HANDLER_H_
 
-#define EFL_BETA_API_SUPPORT
 #include <Ecore_Input.h>
-#include <Ecore_Wl2.h>
-
 #include <vector>
 
 #include "flutter/shell/platform/embedder/embedder.h"

From b47e21f94a97c8ede798055fb87ad599b1171b81 Mon Sep 17 00:00:00 2001
From: xiaowei guan <xiaowei.guan@samsung.com>
Date: Fri, 25 Dec 2020 18:39:17 +0800
Subject: [PATCH 2/2] Extemal_texture_gl does not rely on tbm_bo.h.

---
 shell/platform/tizen/external_texture_gl.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shell/platform/tizen/external_texture_gl.h b/shell/platform/tizen/external_texture_gl.h
index e6fb8d1ed222b..515002c1aa2fb 100644
--- a/shell/platform/tizen/external_texture_gl.h
+++ b/shell/platform/tizen/external_texture_gl.h
@@ -6,7 +6,6 @@
 #define FLUTTER_SHELL_PLATFORM_TIZEN_EXTERNAL_TEXTURE_GL_H_
 
 #include <stdint.h>
-#include <tbm_bo.h>
 #include <tbm_bufmgr.h>
 #include <tbm_drm_helper.h>
 #include <tbm_surface.h>