[GTK] Do not build quota files when QUOTA is disabled
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Jun 2014 10:24:06 +0000 (10:24 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Jun 2014 10:24:06 +0000 (10:24 +0000)
https://bugs.webkit.org/show_bug.cgi?id=134101

Reviewed by Philippe Normand.

* CMakeLists.txt: Remove exception for GTK+ that is no longer
required since r170173.
* PlatformGTK.cmake: Generate GObject DOM bindings for Quota when enabled.

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

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake

index 29f0b0d..39d757f 100644 (file)
@@ -2916,10 +2916,7 @@ if (ENABLE_VIDEO_TRACK)
     )
 endif ()
 
-# On the GTK+ autotools build we used to add these files even if QUOTA is disabled, and
-# because of that we generate GObject bindings for some of the objects. We need to do
-# the same for the cmake build, for now.
-if (ENABLE_QUOTA OR PORT STREQUAL "GTK")
+if (ENABLE_QUOTA)
     list(APPEND WebCore_SOURCES
         Modules/quota/DOMWindowQuota.cpp
         Modules/quota/NavigatorStorageQuota.cpp
index 17f8cdd..f6e8ed1 100644 (file)
@@ -1,3 +1,14 @@
+2014-06-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Do not build quota files when QUOTA is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=134101
+
+        Reviewed by Philippe Normand.
+
+        * CMakeLists.txt: Remove exception for GTK+ that is no longer
+        required since r170173.
+        * PlatformGTK.cmake: Generate GObject DOM bindings for Quota when enabled.
+
 2014-06-20  Manuel Rego Casasnovas  <rego@igalia.com>
 
         [CSS Grid Layout] Add GridSpan::iterator
index c70aa8a..cc82420 100644 (file)
@@ -630,6 +630,19 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
     )
 endif ()
 
+if (ENABLE_QUOTA)
+    list(APPEND GObjectDOMBindingsUnstable_IDL_FILES
+        Modules/quota/DOMWindowQuota.idl
+        Modules/quota/NavigatorStorageQuota.idl
+        Modules/quota/StorageErrorCallback.idl
+        Modules/quota/StorageInfo.idl
+        Modules/quota/StorageQuota.idl
+        Modules/quota/StorageQuotaCallback.idl
+        Modules/quota/StorageUsageCallback.idl
+        Modules/quota/WorkerNavigatorStorageQuota.idl
+    )
+endif ()
+
 set(GObjectDOMBindingsStable_CLASS_LIST Custom EventTarget NodeFilter Object)
 set(GObjectDOMBindingsStable_INSTALLED_HEADERS
      ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h