Remove Ecore-wayland dependency

In Tizen 5.0, upgrading EFL to opensource EFL 1.20 version.
Upstream has deprecated ecore-wayland and changed its policy to use ecore-wl2.
In crosswalk, there is one api with an ecore-wayland dependency(ecore_wl_screen_size_get()).
This can be replaced by elm_win_screen_size_get() api.
So removed the ecore-wayland dependency and used elm_win_screen_size_get()

Change-Id: I7083eec69a98f0cae5fe1406d1544fc2f1557cac
Signed-off-by: min7.choi <min7.choi@samsung.com>

diff --git a/packaging/crosswalk-tizen.spec b/packaging/crosswalk-tizen.spec
index b78ff93eb6c00070eb696b244f061ff3804e1182..945b02e37358e081adf20b087978e8198c6f4dae 100755 (executable)
--- a/packaging/crosswalk-tizen.spec
+++ b/packaging/crosswalk-tizen.spec
@@ -34,7 +34,6 @@ BuildRequires: pkgconfig(cynara-client)
 BuildRequires: pkgconfig(deviced)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(ecore-wayland)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(glib-2.0)

diff --git a/runtime/browser/native_window.cc b/runtime/browser/native_window.cc
index 43f6bef4a5c5c29a8103c107397b8c07acf1ae47..7845b2d118df0bd82f18765bc9f41c348a2184d1 100755 (executable)
--- a/runtime/browser/native_window.cc
+++ b/runtime/browser/native_window.cc
@@ -16,7 +16,6 @@
 
 #include "runtime/browser/native_window.h"
 
-#include <Ecore_Wayland.h>
 #include <EWebKit.h>
 #include <EWebKit_internal.h>
 #include <cstdint>
@@ -96,7 +95,7 @@ void NativeWindow::Initialize() {
   window_ = CreateWindowInternal();
   elm_win_conformant_set(window_, EINA_TRUE);
   int w, h;
-  ecore_wl_screen_size_get(&w, &h);
+  elm_win_screen_size_get(window_, NULL, NULL, &w, &h);
   evas_object_resize(window_, w, h);
   elm_win_size_base_set(window_, w, h);
   elm_win_autodel_set(window_, EINA_TRUE);

diff --git a/runtime/browser/notification_window.cc b/runtime/browser/notification_window.cc
index ee70e5378aacecf48871312c1fc54232b6b7851d..e701601cdaf3f62c55ffaf931f2b22a51e76a885 100644 (file)
--- a/runtime/browser/notification_window.cc
+++ b/runtime/browser/notification_window.cc
@@ -15,7 +15,6 @@
  */
 #include <runtime/browser/notification_window.h>
 
-#include <Ecore_Wayland.h>
 #include <efl_util.h>
 
 namespace runtime {

diff --git a/runtime/browser/runtime_process.cc b/runtime/browser/runtime_process.cc
index 4a1576b72eb01eff49a90e0d6272fda8962f5991..6b8e2ad9007ec541a0c53f24c8e2af56af343c35 100755 (executable)
--- a/runtime/browser/runtime_process.cc
+++ b/runtime/browser/runtime_process.cc
@@ -20,7 +20,6 @@
 #include <Elementary.h>
 
 #include <bundle_internal.h>
-#include <Ecore_Wayland.h>
 
 #include "common/application_data.h"
 #include "common/command_line.h"

diff --git a/runtime/browser/splash_screen.cc b/runtime/browser/splash_screen.cc
index 6b7b456223959147635adb21deeaa9b91469473f..fe860626355d96c3bf5c83d1fb210263edf3dfb3 100755 (executable)
--- a/runtime/browser/splash_screen.cc
+++ b/runtime/browser/splash_screen.cc
@@ -20,7 +20,6 @@
 #include <map>
 #include <string>
 
-#include <Ecore_Wayland.h>
 #include <Evas_Legacy.h>
 
 #include "common/logger.h"
@@ -111,7 +110,7 @@ SplashScreen::SplashScreen(
       ChooseOrientation(splash_map, window->orientation());
   if (used_orientation == wgt::parse::ScreenOrientation::NONE) return;
 
-  auto dimensions = GetDimensions();
+  auto dimensions = GetDimensions(window);
 
   SetBackground(splash_map[used_orientation], window->evas_object(),
                      dimensions, app_path);
@@ -145,9 +144,9 @@ void SplashScreen::HideSplashScreen(HideReason reason) {
   is_active_ = false;
 }
 
-std::pair<int, int> SplashScreen::GetDimensions() {
+std::pair<int, int> SplashScreen::GetDimensions(NativeWindow* window) {
   int w, h;
-  ecore_wl_screen_size_get(&w, &h);
+  elm_win_screen_size_get(window->evas_object(), NULL, NULL, &w, &h);
   evas_object_resize(background_, w, h);
   return std::make_pair(w, h);
 }

diff --git a/runtime/browser/splash_screen.h b/runtime/browser/splash_screen.h
index 11d49cdcf90de18b9931df98f49ff10ec6df9ced..bde9894258586268e70388f989e0730b3e94cf4b 100755 (executable)
--- a/runtime/browser/splash_screen.h
+++ b/runtime/browser/splash_screen.h
@@ -41,7 +41,7 @@ class SplashScreen {
   void HideSplashScreen(HideReason reason);
 
  private:
-  std::pair<int, int> GetDimensions();
+  std::pair<int, int> GetDimensions(NativeWindow* window);
   void SetBackground(const wgt::parse::LaunchScreenData& splash_data,
                      Evas_Object* parent, const SplashScreenBound& bound,
                      const std::string& app_path);

diff --git a/runtime/runtime.gyp b/runtime/runtime.gyp
index 0beb057c965def59b08b4116f71ef1348b8d2fa7..5b5d39431a3ac5af10de077cb079d2e17c73cc74 100755 (executable)
--- a/runtime/runtime.gyp
+++ b/runtime/runtime.gyp
@@ -57,7 +57,6 @@
           'capi-system-info',
           'chromium-efl',
           'ecore',
-          'ecore-wayland',
           'elementary',
           'efl-extension',
           'deviced',