.:
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Aug 2014 06:29:38 +0000 (06:29 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Aug 2014 06:29:38 +0000 (06:29 +0000)
[EFL] Turn on ENABLE_GAMEPAD_DEPRECATED option.
https://bugs.webkit.org/show_bug.cgi?id=136110

Patch by KwangHyuk Kim <hyuki.kim@samsung.com> on 2014-08-22
Reviewed by Gyuyoung Kim.

Turn on ENABLE_GAMEPAD_DEPRECATED option for the WK2 Efl.

* Source/cmake/OptionsEfl.cmake:

Source/WebCore:
[EFL] Fix build break caused by ENABLE_GAMEPAD_DEPRECATED.
https://bugs.webkit.org/show_bug.cgi?id=136110

Patch by KwangHyuk Kim <hyuki.kim@samsung.com> on 2014-08-22
Reviewed by Gyuyoung Kim.

WebCore_INCLUDE_DIRECTORY for gamepad was removed from WK2 Efl in order to fix build break when ENABLE_GAMEPAD_DEPRECATED is on.

No new tests because no functional changes.

* PlatformEfl.cmake:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/cmake/OptionsEfl.cmake

index 7a9ff20..15411b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-08-22  KwangHyuk Kim  <hyuki.kim@samsung.com>
+
+        [EFL] Turn on ENABLE_GAMEPAD_DEPRECATED option.
+        https://bugs.webkit.org/show_bug.cgi?id=136110
+
+        Reviewed by Gyuyoung Kim.
+
+        Turn on ENABLE_GAMEPAD_DEPRECATED option for the WK2 Efl.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2014-08-22  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [EFL] Apply eflsymbols.filter to WebKit2
index abe2717..4e2ad81 100644 (file)
@@ -1,3 +1,16 @@
+2014-08-22  KwangHyuk Kim  <hyuki.kim@samsung.com>
+
+        [EFL] Fix build break caused by ENABLE_GAMEPAD_DEPRECATED.
+        https://bugs.webkit.org/show_bug.cgi?id=136110
+
+        Reviewed by Gyuyoung Kim.
+
+        WebCore_INCLUDE_DIRECTORY for gamepad was removed from WK2 Efl in order to fix build break when ENABLE_GAMEPAD_DEPRECATED is on.
+
+        No new tests because no functional changes.
+
+        * PlatformEfl.cmake:
+
 2014-08-22  Benjamin Poulain  <benjamin@webkit.org>
 
         Style invalidation does not work for adjacent node updates
index 39773c3..a4ec315 100644 (file)
@@ -243,6 +243,13 @@ if (ENABLE_BATTERY_STATUS OR (EFL_REQUIRED_VERSION VERSION_LESS 1.8))
     list(APPEND WebCore_LIBRARIES ${E_DBUS_EUKIT_LIBRARIES})
 endif ()
 
+if (ENABLE_GAMEPAD_DEPRECATED)
+    # FIXME: GAMEPAD_DEPRECATED is legacy implementation. Need to be removed.
+    list(REMOVE_ITEM WebCore_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/Modules/gamepad"
+    )
+endif ()
+
 list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsApple.css
 )
index b26e948..76bfd94 100644 (file)
@@ -72,7 +72,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ENCRYPTED_MEDIA_V2 ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE_IN_WORKERS OFF)