WorkerGlobalScopeWebDatabase requires ENABLE(WORKERS)

https://bugs.webkit.org/show_bug.cgi?id=120395 Reviewed by Christophe Dumez. WorkerGlobalScopeDatabase uses the WorkerGlobalScope object which is defined only when WORKERS are enabled. We should guard that code. * Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp: * Modules/webdatabase/WorkerGlobalScopeWebDatabase.h: * Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl: Canonical link: https://commits.webkit.org/138372@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154732 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Aug 28, 2013 · a186c95 · a186c95
1 parent 3c9c3d0
commit a186c95
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2013-08-28  Sergio Villar Senin  <svillar@igalia.com>
+
+        WorkerGlobalScopeWebDatabase requires ENABLE(WORKERS)
+        https://bugs.webkit.org/show_bug.cgi?id=120395
+
+        Reviewed by Christophe Dumez.
+
+        WorkerGlobalScopeDatabase uses the WorkerGlobalScope object which is
+        defined only when WORKERS are enabled. We should guard that code.
+
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp:
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.h:
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl:
+
 2013-08-28  Sergio Villar Senin  <svillar@igalia.com>
 
         [CSS Grid Layout] Fix grid position resolution

diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
@@ -27,7 +27,7 @@
 
 #include "config.h"
 
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
 
 #include "WorkerGlobalScopeWebDatabase.h"
 
@@ -73,4 +73,4 @@ PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGl
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h
@@ -27,7 +27,7 @@
 #ifndef WorkerGlobalScopeWebDatabase_h
 #define WorkerGlobalScopeWebDatabase_h
 
-#if ENABLE(SQL_DATABASE)
+#if ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
 
 #include "ExceptionCode.h"
 #include <wtf/Forward.h>
@@ -54,6 +54,6 @@ class WorkerGlobalScopeWebDatabase {
 
 } // namespace WebCore
 
-#endif // ENABLE(SQL_DATABASE)
+#endif // ENABLE(SQL_DATABASE) && ENABLE(WORKERS)
 
 #endif // WorkerGlobalScopeWebDatabase_h
diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl
@@ -25,7 +25,7 @@
  */
 
 [
-    Conditional=SQL_DATABASE,
+    Conditional=SQL_DATABASE&WORKERS,
 ] partial interface WorkerGlobalScope {
     [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);