Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

5 files changed, 24 insertions, 12 deletions

diff --git a/Source/cmake/OptionsBlackBerry.cmake b/Source/cmake/OptionsBlackBerry.cmake
index 62342e935..7f9bffb50 100644
--- a/Source/cmake/OptionsBlackBerry.cmake
+++ b/Source/cmake/OptionsBlackBerry.cmake
@@ -168,6 +168,7 @@ WEBKIT_FEATURE(ENABLE_REPAINT_THROTTLING "Enable repaint throttling" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_RUBY "Enable Ruby" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SANDBOX "Enable Sandbox" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SHADOW_DOM "Enable Shadow DOM" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SVG_ANIMATION "Enable SVG animation" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SVG_AS_IMAGE "Enable SVG as image" DEFAULT ON)
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index 734874b0d..d94a942b8 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -14,7 +14,3 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES QNX)
 ELSE ()
     SET(CODE_GENERATOR_PREPROCESSOR "${CMAKE_CXX_COMPILER} -E -P -x c++")
 ENDIF ()
-
-IF (ENABLE_WEBGL)
-    FIND_PACKAGE(OpenGL REQUIRED)
-ENDIF ()
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 97da61136..2f2abf4a3 100644
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -86,6 +86,7 @@ WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF
 WEBKIT_FEATURE(ENABLE_PAGE_VISIBILITY_API "Enable Page Visibility API" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_REQUEST_ANIMATION_FRAME "Enable requestAnimationFrame API" DEFAULT ON)
+WEBKIT_FEATURE(ENABLE_SHADOW_DOM "Enable Shadow DOM" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SQL_DATABASE "Enable SQL database" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
@@ -138,17 +139,14 @@ ELSE ()
   ENDIF ()
 ENDIF ()
 
+IF (NOT ENABLE_SVG)
+  SET(ENABLE_SVG_FONTS 0)
+ENDIF ()
+
 IF (ENABLE_VIDEO)
   SET(ENABLE_GLIB_SUPPORT 1)
   MESSAGE("Forcing Glib support")
-ENDIF()
-
-IF (ENABLE_GLIB_SUPPORT)
-  FIND_PACKAGE(Glib REQUIRED)
-  FIND_PACKAGE(Gthread REQUIRED)
-ENDIF ()
 
-IF (ENABLE_VIDEO)
   FIND_PACKAGE(GStreamer REQUIRED)
   FIND_PACKAGE(GStreamer-App REQUIRED)
   FIND_PACKAGE(GStreamer-Base REQUIRED)
@@ -160,4 +158,13 @@ IF (ENABLE_VIDEO)
   ADD_DEFINITIONS(-DWTF_USE_GSTREAMER=1)
 ENDIF()
 
+IF (ENABLE_GLIB_SUPPORT)
+  FIND_PACKAGE(Glib REQUIRED)
+  FIND_PACKAGE(Gthread REQUIRED)
+ENDIF ()
+
+IF (ENABLE_WEBGL)
+  FIND_PACKAGE(OpenGL REQUIRED)
+ENDIF ()
+
 SET(CPACK_SOURCE_GENERATOR TBZ2)
diff --git a/Source/cmake/OptionsWinCE.cmake b/Source/cmake/OptionsWinCE.cmake
index fdcd98176..71110e359 100644
--- a/Source/cmake/OptionsWinCE.cmake
+++ b/Source/cmake/OptionsWinCE.cmake
@@ -40,6 +40,7 @@ WEBKIT_FEATURE(ENABLE_NOTIFICATIONS "Enable notifications" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_ORIENTATION_EVENTS "Enable orientation events" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_PROGRESS_TAG "Enable progress tag" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SHARED_WORKERS "Enable shared workers" DEFAULT OFF)
+WEBKIT_FEATURE(ENABLE_SHADOW_DOM "Enable Shadow DOM" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SQL_DATABASE "Enable SQL database" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_SVG "Enable SVG" DEFAULT ON)
 WEBKIT_FEATURE(ENABLE_SVG_FONTS "Enable SVG fonts" DEFAULT ON)
diff --git a/Source/cmake/WebKitHelpers.cmake b/Source/cmake/WebKitHelpers.cmake
index ea4782813..b5448d990 100644
--- a/Source/cmake/WebKitHelpers.cmake
+++ b/Source/cmake/WebKitHelpers.cmake
@@ -7,9 +7,16 @@ MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
         SET(OLD_COMPILE_FLAGS "")
     ENDIF ()
 
+    INCLUDE(TestCXXAcceptsFlag)
+    CHECK_CXX_ACCEPTS_FLAG("-dumpversion" CMAKE_CXX_ACCEPTS_DUMPVERSION)
+    IF (CMAKE_CXX_ACCEPTS_DUMPVERSION)
+        EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE COMPILER_VERSION)
+    ELSE ()
+        EXEC_PROGRAM("${CMAKE_CXX_COMPILER} -E -Wp,-dM - < /dev/null | grep '#define __VERSION__' | grep -E -o '[0-9]+\\.[0-9]+\\.?[0-9]+?'" OUTPUT_VARIABLE COMPILER_VERSION)
+    ENDIF ()
+
     # Disable some optimizations on buggy compiler versions
     # GCC 4.5.1 does not implement -ftree-sra correctly
-    EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE COMPILER_VERSION)
     IF (${COMPILER_VERSION} STREQUAL "4.5.1")
         SET(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -fno-tree-sra")
     ENDIF ()