Enable TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE back

TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE is needed to get HW accelerated
video. It can be re-enabled after EGL Lock Surface runtime check is implemented.

Change-Id: I6e154445c2682746c6107d929b0375cca8b6612f
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/Source/cmake/OptionsTizen.cmake b/Source/cmake/OptionsTizen.cmake
index 32b70b5..299436e 100644 (file)
--- a/Source/cmake/OptionsTizen.cmake
+++ b/Source/cmake/OptionsTizen.cmake
@@ -262,11 +262,13 @@ IF ("${EFL_TARGET}" STREQUAL "i386")
     SET(WTF_USE_ACCELERATED_COMPOSITING 1)
     SET(WTF_USE_TEXTURE_MAPPER 1)
     SET(ENABLE_WEBGL 1)
-    ADD_DEFINITIONS(-DENABLE_TIZEN_WEBKIT2_DIRECT_RENDERING=0)
-    SET(ENABLE_TIZEN_WEBKIT2_DIRECT_RENDERING 0)
-    ADD_DEFINITIONS(-DENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE=0)
-    ADD_DEFINITIONS(-DWTF_USE_ACCELERATED_VIDEO_VAAPI=0)
-    SET(ENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE 0)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_WEBKIT2_DIRECT_RENDERING=1)
+    SET(ENABLE_TIZEN_WEBKIT2_DIRECT_RENDERING 1)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE=1)
+    SET(ENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE 1)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_ACCELERATED_2D_CANVAS_EFL=0)
+    SET(ENABLE_TIZEN_ACCELERATED_2D_CANVAS_EFL 0)
+    ADD_DEFINITIONS(-DWTF_USE_ACCELERATED_VIDEO_VAAPI=1)
 ELSEIF ("${EFL_TARGET}" STREQUAL "emulator")
     MESSAGE("i386 emulator Build Mode <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")
     SET(WTF_USE_ACCELERATED_COMPOSITING 1)
@@ -276,6 +278,8 @@ ELSEIF ("${EFL_TARGET}" STREQUAL "emulator")
     SET(ENABLE_TIZEN_WEBKIT2_DIRECT_RENDERING 0)
     ADD_DEFINITIONS(-DENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE=0)
     SET(ENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE 0)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_ACCELERATED_2D_CANVAS_EFL=0)
+    SET(ENABLE_TIZEN_ACCELERATED_2D_CANVAS_EFL 0)
 ELSE ()
     SET(WTF_USE_ACCELERATED_COMPOSITING 1)
     SET(WTF_USE_TEXTURE_MAPPER 1)
@@ -284,6 +288,8 @@ ELSE ()
     SET(ENABLE_TIZEN_WEBKIT2_DIRECT_RENDERING 1)
     ADD_DEFINITIONS(-DENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE=1)
     SET(ENABLE_TIZEN_WEBKIT2_TILED_AC_SHARED_PLATFORM_SURFACE 1)
+    ADD_DEFINITIONS(-DENABLE_TIZEN_ACCELERATED_2D_CANVAS_EFL=1)
+    SET(ENABLE_TIZEN_ACCELERATED_2D_CANVAS_EFL 1)
     SET(ENABLE_WEBAUDIO_FFMPEG 1)
 ENDIF ()