Broken build with build-webkit --no-video
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Jul 2014 20:06:42 +0000 (20:06 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Jul 2014 20:06:42 +0000 (20:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=134587

Reviewed by Darin Adler.

MEDIA_CONTROLS_SCRIPT requires VIDEO enabled.

.:
* Source/cmake/WebKitFeatures.cmake: Added the dependency for ENABLE_MEDIA_CONTROLS_SCRIPT.

Source/WTF:
* wtf/FeatureDefines.h: Added error message for dependency failure.

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

ChangeLog
Source/WTF/ChangeLog
Source/WTF/wtf/FeatureDefines.h
Source/cmake/WebKitFeatures.cmake

index 1bc3328..f6acc60 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2014-07-03  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Broken build with build-webkit --no-video
+        https://bugs.webkit.org/show_bug.cgi?id=134587
+
+        Reviewed by Darin Adler.
+
+        MEDIA_CONTROLS_SCRIPT requires VIDEO enabled.
+
+        * Source/cmake/WebKitFeatures.cmake: Added the dependency for ENABLE_MEDIA_CONTROLS_SCRIPT.
+
 2014-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] The list of features shown by cmake is not accurate
index 1c51225..55f88bd 100644 (file)
@@ -1,3 +1,14 @@
+2014-07-03  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Broken build with build-webkit --no-video
+        https://bugs.webkit.org/show_bug.cgi?id=134587
+
+        Reviewed by Darin Adler.
+
+        MEDIA_CONTROLS_SCRIPT requires VIDEO enabled.
+
+        * wtf/FeatureDefines.h: Added error message for dependency failure.
+
 2014-07-02  Enrica Casucci  <enrica@apple.com>
 
         iOS build fix after http://trac.webkit.org/changeset/170697.
index eaf4c34..3b0ba88 100644 (file)
 #error "ENABLE(VIDEO_TRACK) requires ENABLE(VIDEO)"
 #endif
 
+#if ENABLE(MEDIA_CONTROLS_SCRIPT) && !ENABLE(VIDEO)
+#error "ENABLE(MEDIA_CONTROLS_SCRIPT) requires ENABLE(VIDEO)"
+#endif
+
 #if ENABLE(REMOTE_INSPECTOR) && !ENABLE(INSPECTOR)
 #error "ENABLE(REMOTE_INSPECTOR) requires ENABLE(INSPECTOR)"
 #endif
index bfb2666..965e1ee 100644 (file)
@@ -131,6 +131,7 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of TCmalloc" OFF)
     WEBKIT_OPTION_DEFINE(WTF_USE_TILED_BACKING_STORE "Toggle Tiled Backing Store support" OFF)
 
+    WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_CONTROLS_SCRIPT ENABLE_VIDEO)
     WEBKIT_OPTION_DEPEND(ENABLE_VIDEO_TRACK ENABLE_VIDEO)
     WEBKIT_OPTION_DEPEND(ENABLE_TOUCH_SLIDER ENABLE_TOUCH_EVENT)
 endmacro()