[EFL] Add a ENABLE_CSS_SCROLL_SNAP macro to CMake build system

https://bugs.webkit.org/show_bug.cgi?id=139085 Reviewed by Andreas Kling. .: * Source/cmake/OptionsEfl.cmake: Add ENABLE_CSS_SCROLL_SNAP. * Source/cmake/WebKitFeatures.cmake: ditto. * Source/cmakeconfig.h.cmake: ditto. Source/WebCore: * PlatformEfl.cmake: Include page/scrolling/AxisScrollSnapOffsets.cpp to EFL build files to fix build break. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@176620 268f45cc-cd09-0410-ab3c-d52691b4dbfc
juguanhui · Dec 2, 2014 · 03a0433 · 03a0433
1 parent 13d840f
commit 03a0433
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2014-12-01  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Add a ENABLE_CSS_SCROLL_SNAP macro to CMake build system
+        https://bugs.webkit.org/show_bug.cgi?id=139085
+
+        Reviewed by Andreas Kling.
+
+        * Source/cmake/OptionsEfl.cmake: Add ENABLE_CSS_SCROLL_SNAP.
+        * Source/cmake/WebKitFeatures.cmake: ditto.
+        * Source/cmakeconfig.h.cmake: ditto.
+
 2014-11-30  Ryuan Choi  <ryuan.choi@navercorp.com>
 
         [EFL] Drop support for the EFL 1.7

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-01  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        [EFL] Add a ENABLE_CSS_SCROLL_SNAP macro to CMake build system
+        https://bugs.webkit.org/show_bug.cgi?id=139085
+
+        Reviewed by Andreas Kling.
+
+        * PlatformEfl.cmake: 
+            Include page/scrolling/AxisScrollSnapOffsets.cpp to EFL build files to fix build break.
+
 2014-12-01  Zalan Bujtas  <zalan@apple.com>
 
         Twitter avatar moves when hovering/unhovering the "follow" button.

diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake
@@ -58,6 +58,8 @@ list(APPEND WebCore_SOURCES
     page/efl/DragControllerEfl.cpp
     page/efl/EventHandlerEfl.cpp
 
+    page/scrolling/AxisScrollSnapOffsets.cpp
+
     page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp
     page/scrolling/coordinatedgraphics/ScrollingStateNodeCoordinatedGraphics.cpp
     page/scrolling/coordinatedgraphics/ScrollingStateScrollingNodeCoordinatedGraphics.cpp

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
@@ -71,6 +71,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOM4_EVENTS_CONSTRUCTOR ON)

diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
@@ -41,6 +41,7 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" OFF)
+    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SHAPES "Toggle CSS Shapes support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CURSOR_VISIBILITY "Toggle cursor visibility support" OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_CUSTOM_SCHEME_HANDLER "Toggle Custom Scheme Handler support" OFF)

diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
@@ -26,6 +26,7 @@
 #cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
 #cmakedefine01 ENABLE_CSS_IMAGE_SET
 #cmakedefine01 ENABLE_CSS_REGIONS
+#cmakedefine01 ENABLE_CSS_SCROLL_SNAP
 #cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
 #cmakedefine01 ENABLE_CSS_SHAPES
 #cmakedefine01 ENABLE_CURSOR_VISIBILITY