EFL_UPGRADE: remove ecore-wayland dependency

Change-Id: Ibbd0f7062ae94abf6c6493b7fccd87eaa4d2dcfe
Signed-off-by: hyunho <hhstark.kang@samsung.com>

4 files changed, 23 insertions, 18 deletions

diff --git a/screen_connector_remote_surface_evas/CMakeLists.txt b/screen_connector_remote_surface_evas/CMakeLists.txt
index 551ac66..196f73b 100644
--- a/screen_connector_remote_surface_evas/CMakeLists.txt
+++ b/screen_connector_remote_surface_evas/CMakeLists.txt
@@ -15,7 +15,7 @@ pkg_check_modules(screen_connector_remote_surface_evas REQUIRED
 	wayland-tbm-client
 	elementary
 	wayland-client
-	ecore-wayland
+	ecore-wl2
 	tizen-remote-surface-client
 )
 
diff --git a/screen_connector_remote_surface_evas/remote_surface_evas.cc b/screen_connector_remote_surface_evas/remote_surface_evas.cc
index 5b52e83..e51c92c 100644
--- a/screen_connector_remote_surface_evas/remote_surface_evas.cc
+++ b/screen_connector_remote_surface_evas/remote_surface_evas.cc
@@ -15,7 +15,7 @@
  */
 
 #include <dlog.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #include <memory>
 
@@ -403,7 +403,8 @@ void RemoteSurfaceEvas::Impl::OnMove(const EvasObject& obj, void *eventInfo) {
 
 bool RemoteSurfaceEvas::IsVisibleArea() const {
   int x, y, w, h;
-  Ecore_Wl_Window *window = NULL;
+  Ecore_Wl2_Window *window = NULL;
+  Ecore_Evas *ee;
   int window_x, window_y, window_w, window_h;
   int rotation;
 
@@ -412,11 +413,13 @@ bool RemoteSurfaceEvas::IsVisibleArea() const {
     return false;
   }
 
-  window = elm_win_wl_window_get(impl_->viewer_win_->GetRaw());
-  ecore_wl_window_geometry_get(window, &window_x, &window_y,
+  ee = ecore_evas_ecore_evas_get(
+    evas_object_evas_get(impl_->viewer_win_->GetRaw()));
+  window = ecore_evas_wayland2_window_get(ee);
+  ecore_wl2_window_geometry_get(window, &window_x, &window_y,
       &window_w, &window_h);
   evas_object_geometry_get(impl_->img_tbm_->GetRaw(), &x, &y, &w, &h);
-  rotation = ecore_wl_window_rotation_get(window);
+  rotation = ecore_wl2_window_rotation_get(window);
 
   if (x >= 0 && x < window_w && y >= 0 && y < window_h &&
       (rotation == 0 || rotation == 180)) {
@@ -465,13 +468,13 @@ void RemoteSurfaceEvas::OnBufferChanged(int type, std::shared_ptr<WlBuffer> tbm,
         : new Image(evas_object_image_filled_add(
             evas_object_evas_get(impl_->viewer_win_->GetRaw())),
             impl_.get(), GetInstId(), GetPid(), this));
-    Ecore_Wl_Window* wlWin = elm_win_wl_window_get(
-        impl_->viewer_win_->GetRaw());
-
+    Ecore_Evas *ee = ecore_evas_ecore_evas_get(
+      evas_object_evas_get(impl_->viewer_win_->GetRaw()));
+    Ecore_Wl2_Window* wlWin = ecore_evas_wayland2_window_get(ee);
     if (!wlWin)
       LOGE("Failed to get wlWin");
     else
-      impl_->winVisibility_map_[ecore_wl_window_id_get(wlWin)] = UNKNOWN;
+      impl_->winVisibility_map_[ecore_wl2_window_id_get(wlWin)] = UNKNOWN;
     isAdded = true;
   }
 
@@ -499,22 +502,24 @@ void RemoteSurfaceEvas::OnEvasChanged(const std::string& appId,
 
 void RemoteSurfaceEvas::Bind(const EvasObject& win) {
   struct wl_surface* surface;
-  Ecore_Wl_Window* wl_win;
+  Ecore_Wl2_Window* wl_win;
+  Ecore_Evas *ee = ecore_evas_ecore_evas_get(
+    evas_object_evas_get(win.GetRaw()));
   int bind_win_id;
 
-  wl_win = elm_win_wl_window_get(win.GetRaw());
+  wl_win = ecore_evas_wayland2_window_get(ee);
   if (!wl_win) {
     LOGE("failed to get wl_win");
     return;
   }
 
-  surface = ecore_wl_window_surface_get(wl_win);
+  surface = ecore_wl2_window_surface_get(wl_win);
   if (!surface) {
     LOGE("failed to get surface");
     return;
   }
 
-  bind_win_id = ecore_wl_window_id_get(wl_win);
+  bind_win_id = ecore_wl2_window_id_get(wl_win);
   impl_->winVisibility_map_[bind_win_id] = UNKNOWN;
   impl_->bind_win_id_ = bind_win_id;
 
@@ -560,8 +565,8 @@ void RemoteSurfaceEvas::NotifyWindowVisibilityEvent(int type, void* event) {
   if (!IsVisibleArea())
     return;
 
-  Ecore_Wl_Event_Window_Visibility_Change* ev =
-      static_cast<Ecore_Wl_Event_Window_Visibility_Change*>(event);
+  Ecore_Wl2_Event_Window_Visibility_Change* ev =
+      static_cast<Ecore_Wl2_Event_Window_Visibility_Change*>(event);
   Visibility v;
 
   if (ev->fully_obscured)
diff --git a/screen_connector_remote_surface_evas/remote_surface_mixed.cc b/screen_connector_remote_surface_evas/remote_surface_mixed.cc
index dba33ad..24df22b 100644
--- a/screen_connector_remote_surface_evas/remote_surface_mixed.cc
+++ b/screen_connector_remote_surface_evas/remote_surface_mixed.cc
@@ -15,7 +15,7 @@
  */
 
 #include <dlog.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #include <memory>
 
diff --git a/screen_connector_remote_surface_evas/remote_surface_watcher.cc b/screen_connector_remote_surface_evas/remote_surface_watcher.cc
index 675a539..7c5d3cb 100644
--- a/screen_connector_remote_surface_evas/remote_surface_watcher.cc
+++ b/screen_connector_remote_surface_evas/remote_surface_watcher.cc
@@ -15,7 +15,7 @@
  */
 
 #include <dlog.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #include <memory>