Merge pull request #47 from psikorski/x11_remove

X11 code removal

diff --git a/packaging/crosswalk-tizen.spec b/packaging/crosswalk-tizen.spec
index d80c4fc..0c9e180 100644 (file)
--- a/packaging/crosswalk-tizen.spec
+++ b/packaging/crosswalk-tizen.spec
@@ -14,14 +14,6 @@ URL:        https://www.tizen.org
 Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 
-################ disable builds in X11 repos #################
-# currently, crosswalk-tizen is not needed on X11 profiles
-# see TINF-965
-%if %{with x}
-ExclusiveArch:
-%endif
-##############################################################
-
 ########## disable builds in wearable profile ################
 # currently, crosswalk-tizen doesn't support wearable profile
 %if "%{?profile}" == "wearable"

diff --git a/runtime/browser/native_window.cc b/runtime/browser/native_window.cc
index c1b36cd..89a6c5d 100755 (executable)
--- a/runtime/browser/native_window.cc
+++ b/runtime/browser/native_window.cc
@@ -16,12 +16,7 @@
 
 #include "runtime/browser/native_window.h"
 
-#if defined(HAVE_X11)
-#include <Ecore_X.h>
-#elif defined(HAVE_WAYLAND)
 #include <Ecore_Wayland.h>
-#endif
-
 #include <cstdint>
 
 #include "common/logger.h"
@@ -51,17 +46,7 @@ void NativeWindow::Initialize() {
   window_ = CreateWindowInternal();
   elm_win_conformant_set(window_, EINA_TRUE);
   int w, h;
-#if defined(HAVE_X11)
-  uint16_t pid = getpid();
-  ecore_x_window_prop_property_set(
-    elm_win_xwindow_get(window_),
-    ECORE_X_ATOM_NET_WM_PID,
-    ECORE_X_ATOM_CARDINAL, 32, &pid, 1);
-  ecore_x_vsync_animator_tick_source_set(elm_win_xwindow_get(window_));
-  ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
-#elif defined(HAVE_WAYLAND)
   ecore_wl_screen_size_get(&w, &h);
-#endif
   evas_object_resize(window_, w, h);
   elm_win_autodel_set(window_, EINA_TRUE);
   evas_object_smart_callback_add(window_, "delete,request",

diff --git a/runtime/browser/splash_screen.cc b/runtime/browser/splash_screen.cc
index 8bc89f8..81ef0f2 100644 (file)
--- a/runtime/browser/splash_screen.cc
+++ b/runtime/browser/splash_screen.cc
@@ -20,11 +20,7 @@
 #include <map>
 #include <string>
 
-#if defined(HAVE_X11)
-#include <Ecore_X.h>
-#elif defined(HAVE_WAYLAND)
 #include <Ecore_Wayland.h>
-#endif
 #include <Evas_Legacy.h>
 
 #include "common/logger.h"
@@ -149,17 +145,7 @@ void SplashScreen::HideSplashScreen(HideReason reason) {
 
 std::pair<int, int> SplashScreen::GetDimensions() {
   int w, h;
-#if defined(HAVE_X11)
-  uint16_t pid = getpid();
-  ecore_x_window_prop_property_set(elm_win_xwindow_get(window_.evas_object()),
-                                   ECORE_X_ATOM_NET_WM_PID,
-                                   ECORE_X_ATOM_CARDINAL, 32, &pid, 1);
-  ecore_x_vsync_animator_tick_source_set(
-      elm_win_xwindow_get(window_.evas_object()));
-  ecore_x_window_size_get(ecore_x_window_root_first_get(), &w, &h);
-#elif defined(HAVE_WAYLAND)
   ecore_wl_screen_size_get(&w, &h);
-#endif
   evas_object_resize(background_, w, h);
   return std::make_pair(w, h);
 }

diff --git a/runtime/runtime.gyp b/runtime/runtime.gyp
index 9c64060..19c964b 100644 (file)
--- a/runtime/runtime.gyp
+++ b/runtime/runtime.gyp
@@ -37,9 +37,6 @@
         'browser/notification_manager.h',
         'browser/notification_manager.cc',
       ],
-      'defines': [
-        'HAVE_WAYLAND',
-      ],
       'variables': {
         'packages': [
           'capi-appfw-application',