[Tizen-submit] 20857: Changes to Tizen:IVI/webkit2-efl

noreply at tizen.org noreply at tizen.org
Tue Feb 4 16:22:31 GMT 2014


Hi,
Baptiste DURAND have made the following changes to webkit2-efl in project Tizen:IVI. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #20857

  submit:       Tizen:IVI:build/webkit2-efl(cleanup) -> Tizen:IVI


Message:
Submitter: Baptiste DURAND <baptiste.durand at open.eurogiciel.org>
Comments: Add support to disable Lock Surface during run time
Git project: platform/framework/web/webkit-efl
Tag: submit/tizen/20140204.162401
Commit: 90bce41a62eba54ba7fac222d6820ca3bdc44789 Add support to disable Lock Surface during run time.

State:   new        2014-02-04T16:24:26 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- webkit2-efl.spec
+++ webkit2-efl.spec
@@ -4,7 +4,7 @@
 %bcond_with audio_session_manager
 %bcond_with audio_session_manager_with_murphy
 Name: webkit2-efl
-VCS:  platform/framework/web/webkit-efl#bcb8af88ba97ce0adacb380c062a53234eb0dcb7
+VCS:  platform/framework/web/webkit-efl#90bce41a62eba54ba7fac222d6820ca3bdc44789
 Summary: Webkit2 EFL
 Version: 123997_0.12.1
 Release: 1

other changes:
--------------

++++++ webkit2-efl-123997_0.12.1.tar.gz
--- Source/WebCore/platform/graphics/efl/tizen/SharedPlatformSurfaceTizen.cpp
+++ Source/WebCore/platform/graphics/efl/tizen/SharedPlatformSurfaceTizen.cpp
@@ -96,9 +96,12 @@
         return supportLockSurfaceExt;
 
     initialized = true;
-
 #if PLATFORM(WAYLAND) && USE(MESA)
-    supportLockSurfaceExt = true;
+    if (getenv("TIZEN_SHARED_PLATFORM_SURFACE_LOCK_DISABLE")) {
+        supportLockSurfaceExt = false;
+    } else {
+        supportLockSurfaceExt = true;
+    }
 #else
     supportLockSurfaceExt = GLPlatformContext::supportsEGLExtension(EGLHelper::currentDisplay(), "EGL_KHR_lock_surface");
 #endif
--- Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h
+++ Source/WebCore/platform/graphics/surfaces/egl/EGLSurface.h
@@ -40,7 +40,10 @@
 #define EGL_EGLEXT_PROTOTYPES 1
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
+
+#if PLATFORM(WAYLAND) && USE(MESA)
 #include "WaylandPlatformExt.h"
+#endif
 
 #define GL_GLEXT_PROTOTYPES 1
 #if USE(OPENGL_ES_2)
--- Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
+++ Source/WebKit2/UIProcess/API/efl/tizen/ewk_popup_picker.cpp
@@ -29,8 +29,6 @@
 #include <Elementary.h>
 #include <libintl.h>
 
-#if ENABLE(TIZEN_DESKTOP_BROWSING)
-
 #if ENABLE(TIZEN_MULTIPLE_SELECT)
 int compareChangedItems(const void* a, const void* b)
 {
@@ -40,6 +38,8 @@
 }
 #endif
 
+#if ENABLE(TIZEN_DESKTOP_BROWSING)
+
 static void on_popup_menu_discarded(void *user_data, Evas_Object *obj, void *event_info)
 {
     // The user clicked outside the menu to discard it.
@@ -400,12 +400,5 @@
     resizeAndShowPicker(picker);
 }
 
-#if ENABLE(TIZEN_MULTIPLE_SELECT)
-int compareChangedItems(const void* a, const void* b)
-{
-    const int* left = static_cast<const int*>(a);
-    const int* right = static_cast<const int*>(b);
-    return (*left - *right);
-}
-#endif // ENABLE(TIZEN_DESKTOP_BROWSING)
+
 #endif // ENABLE(TIZEN_WEBKIT2_POPUP_INTERNAL)


More information about the Tizen-submit mailing list