Changeset 43699 in webkit

Timestamp:

May 14, 2009 7:49:32 AM (15 years ago)

Author:

kov@webkit.org

Message:

2009-05-14 Ben Murdoch <​benm@google.com>

Reviewed by Darin Adler.

Add more ENABLE_DATABASE guards.
​https://bugs.webkit.org/show_bug.cgi?id=25616

See also ​https://bugs.webkit.org/show_bug.cgi?id=24776 (original set of guards)

• bindings/js/JSSQLResultSetRowListCustom.cpp:
• bindings/v8/custom/V8CustomSQLStatementCallback.cpp:
• bindings/v8/custom/V8CustomSQLStatementCallback.h:
• bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp:
• bindings/v8/custom/V8CustomSQLStatementErrorCallback.h:
• bindings/v8/custom/V8CustomSQLTransactionCallback.cpp:
• bindings/v8/custom/V8CustomSQLTransactionCallback.h:
• bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp:
• bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h:
• bindings/v8/custom/V8DatabaseCustom.cpp:
• bindings/v8/custom/V8SQLResultSetRowListCustom.cpp:
• bindings/v8/custom/V8SQLTransactionCustom.cpp:
• storage/Database.cpp:
• storage/DatabaseDetails.h:
• storage/OriginUsageRecord.cpp:
• storage/OriginUsageRecord.h:
• storage/SQLError.h:
• storage/SQLError.idl:
• storage/SQLResultSet.cpp:
• storage/SQLResultSet.h:
• storage/SQLResultSet.idl:
• storage/SQLResultSetRowList.cpp:
• storage/SQLResultSetRowList.h:
• storage/SQLResultSetRowList.idl:
• storage/SQLStatementCallback.h:
• storage/SQLStatementErrorCallback.h:
• storage/SQLTransactionCallback.h:
• storage/SQLTransactionErrorCallback.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSSQLResultSetRowListCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLStatementCallback.cpp (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLStatementCallback.h (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLStatementErrorCallback.h (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLTransactionCallback.cpp (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLTransactionCallback.h (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp (modified) (2 diffs)
• bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h (modified) (2 diffs)
• bindings/v8/custom/V8DatabaseCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8SQLResultSetRowListCustom.cpp (modified) (2 diffs)
• bindings/v8/custom/V8SQLTransactionCustom.cpp (modified) (2 diffs)
• storage/Database.cpp (modified) (2 diffs)
• storage/DatabaseDetails.h (modified) (2 diffs)
• storage/OriginUsageRecord.cpp (modified) (2 diffs)
• storage/OriginUsageRecord.h (modified) (2 diffs)
• storage/SQLError.h (modified) (2 diffs)
• storage/SQLError.idl (modified) (1 diff)
• storage/SQLResultSet.cpp (modified) (2 diffs)
• storage/SQLResultSet.h (modified) (2 diffs)
• storage/SQLResultSet.idl (modified) (1 diff)
• storage/SQLResultSetRowList.cpp (modified) (2 diffs)
• storage/SQLResultSetRowList.h (modified) (2 diffs)
• storage/SQLResultSetRowList.idl (modified) (1 diff)
• storage/SQLStatementCallback.h (modified) (2 diffs)
• storage/SQLStatementErrorCallback.h (modified) (2 diffs)
• storage/SQLTransactionCallback.h (modified) (2 diffs)
• storage/SQLTransactionErrorCallback.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-05-14  Ben Murdoch  <benm@google.com>
+
+        Reviewed by Darin Adler.
+
+        Add more ENABLE_DATABASE guards.
+        https://bugs.webkit.org/show_bug.cgi?id=25616
+
+        See also https://bugs.webkit.org/show_bug.cgi?id=24776 (original set of guards)
+
+        * bindings/js/JSSQLResultSetRowListCustom.cpp:
+        * bindings/v8/custom/V8CustomSQLStatementCallback.cpp:
+        * bindings/v8/custom/V8CustomSQLStatementCallback.h:
+        * bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp:
+        * bindings/v8/custom/V8CustomSQLStatementErrorCallback.h:
+        * bindings/v8/custom/V8CustomSQLTransactionCallback.cpp:
+        * bindings/v8/custom/V8CustomSQLTransactionCallback.h:
+        * bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp:
+        * bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h:
+        * bindings/v8/custom/V8DatabaseCustom.cpp:
+        * bindings/v8/custom/V8SQLResultSetRowListCustom.cpp:
+        * bindings/v8/custom/V8SQLTransactionCustom.cpp:
+        * storage/Database.cpp:
+        * storage/DatabaseDetails.h:
+        * storage/OriginUsageRecord.cpp:
+        * storage/OriginUsageRecord.h:
+        * storage/SQLError.h:
+        * storage/SQLError.idl:
+        * storage/SQLResultSet.cpp:
+        * storage/SQLResultSet.h:
+        * storage/SQLResultSet.idl:
+        * storage/SQLResultSetRowList.cpp:
+        * storage/SQLResultSetRowList.h:
+        * storage/SQLResultSetRowList.idl:
+        * storage/SQLStatementCallback.h:
+        * storage/SQLStatementErrorCallback.h:
+        * storage/SQLTransactionCallback.h:
+        * storage/SQLTransactionErrorCallback.h:
+
 2009-05-11  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp

@@ -29 +29 @@
 #include "config.h"
 #include "JSSQLResultSetRowList.h"
+
+#if ENABLE(DATABASE)
 
 #include "ExceptionCode.h"
@@ -80 +82 @@
 
 }
+
+#endif

trunk/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
+
 #include "V8CustomSQLStatementCallback.h"
 
@@ -71 +74 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/bindings/v8/custom/V8CustomSQLStatementCallback.h

@@ -32 +32 @@
 #define V8CustomSQLStatementCallback_h
 
+#if ENABLE(DATABASE)
+
 #include "SQLStatementCallback.h"
 #include <v8.h>
@@ -60 +62 @@
 } // namespace WebCore
 
+#endif
+
 #endif // V8CustomSQLStatementCallback_h

trunk/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
+
 #include "V8CustomSQLStatementErrorCallback.h"
 
@@ -75 +78 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/bindings/v8/custom/V8CustomSQLStatementErrorCallback.h

@@ -32 +32 @@
 #define V8CustomSQLStatementErrorCallback_h
 
+#if ENABLE(DATABASE)
+
 #include "SQLStatementErrorCallback.h"
 
@@ -62 +64 @@
 } // namespace WebCore
 
+#endif
+
 #endif // V8CustomSQLStatementErrorCallback_h

trunk/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
+
 #include "V8CustomSQLTransactionCallback.h"
 
@@ -74 +77 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/bindings/v8/custom/V8CustomSQLTransactionCallback.h

@@ -32 +32 @@
 #define V8CustomSQLTransactionCallback_h
 
+#if ENABLE(DATABASE)
+
 #include "SQLTransactionCallback.h"
 #include <v8.h>
@@ -60 +62 @@
 } // namespace WebCore
 
+#endif
+
 #endif // V8CustomSQLTransactionCallback_h

trunk/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
+
 #include "V8CustomSQLTransactionErrorCallback.h"
 
@@ -74 +77 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/bindings/v8/custom/V8CustomSQLTransactionErrorCallback.h

@@ -32 +32 @@
 #define V8CustomSQLTransactionErrorCallback_h
 
+#if ENABLE(DATABASE)
+
 #include "SQLTransactionErrorCallback.h"
 #include <v8.h>
@@ -61 +63 @@
 } // namespace WebCore
 
+#endif
+
 #endif // V8CustomSQLTransactionErrorCallback_h

trunk/WebCore/bindings/v8/custom/V8DatabaseCustom.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
 
 #include "v8_binding.h"
@@ -92 +94 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/bindings/v8/custom/V8SQLResultSetRowListCustom.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
 
 #include "v8_binding.h"
@@ -89 +91 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/bindings/v8/custom/V8SQLTransactionCustom.cpp

@@ -30 +30 @@
 
 #include "config.h"
+
+#if ENABLE(DATABASE)
 
 #include "v8_binding.h"
@@ -113 +115 @@
 
 } // namespace WebCore
+
+#endif
+

trunk/WebCore/storage/Database.cpp

@@ -30 +30 @@
 #include "Database.h"
 
+#include <wtf/StdLibExtras.h>
+
 #if ENABLE(DATABASE)
 #include "ChangeVersionWrapper.h"
@@ -50 +52 @@
 #include "SQLResultSet.h"
 #include <wtf/MainThread.h>
-#include <wtf/StdLibExtras.h>
 #endif
 

trunk/WebCore/storage/DatabaseDetails.h

@@ -29 +29 @@
 #ifndef DatabaseDetails_h
 #define DatabaseDetails_h
+
+#if ENABLE(DATABASE)
 
 #include "PlatformString.h"
@@ -65 +67 @@
 } // namespace WebCore
 
+#endif
+
 #endif // DatabaseDetails_h

trunk/WebCore/storage/OriginUsageRecord.cpp

@@ -28 +28 @@
 #include "config.h"
 #include "OriginUsageRecord.h"
+
+#if ENABLE(DATABASE)
 
 #include "FileSystem.h"
@@ -103 +105 @@
     
 }
+
+#endif

trunk/WebCore/storage/OriginUsageRecord.h

@@ -28 +28 @@
 #ifndef OriginUsageRecord_h
 #define OriginUsageRecord_h
+
+#if ENABLE(DATABASE)
 
 #include "PlatformString.h"
@@ -65 +67 @@
 } // namespace WebCore
 
+#endif
+
 #endif 

trunk/WebCore/storage/SQLError.h

@@ -30 +30 @@
 #define SQLError_h
 
+#if ENABLE(DATABASE)
+
 #include "PlatformString.h"
 #include <wtf/Threading.h>
@@ -50 +52 @@
 }
 
+#endif
+
 #endif // SQLError_h

trunk/WebCore/storage/SQLError.idl

@@ -29 +29 @@
 module storage {
 
-    interface SQLError {
+    interface [
+        Conditional=DATABASE
+    ] SQLError {
         readonly attribute unsigned long code;
         readonly attribute DOMString message;

trunk/WebCore/storage/SQLResultSet.cpp

@@ -29 +29 @@
 #include "config.h"
 #include "SQLResultSet.h"
+
+#if ENABLE(DATABASE)
 
 #include "ExceptionCode.h"
@@ -80 +82 @@
 
 }
+
+#endif

trunk/WebCore/storage/SQLResultSet.h

@@ -29 +29 @@
 #ifndef SQLResultSet_h
 #define SQLResultSet_h
+
+#if ENABLE(DATABASE)
 
 #include "SQLResultSetRowList.h"
@@ -61 +63 @@
 } // namespace WebCore
 
+#endif
+
 #endif // SQLResultSet_h

trunk/WebCore/storage/SQLResultSet.idl

@@ -29 +29 @@
 module storage {
 
-    interface SQLResultSet {
+    interface [
+        Conditional=DATABASE
+    ] SQLResultSet {
         readonly attribute SQLResultSetRowList rows;
 

trunk/WebCore/storage/SQLResultSetRowList.cpp

@@ -30 +30 @@
 #include "SQLResultSetRowList.h"
 
+#if ENABLE(DATABASE)
+
 namespace WebCore {
 
@@ -43 +45 @@
 
 }
+
+#endif

trunk/WebCore/storage/SQLResultSetRowList.h

@@ -30 +30 @@
 #define SQLResultSetRowList_h
 
+#if ENABLE(DATABASE)
+
 #include <wtf/PassRefPtr.h>
 #include "SQLValue.h"
@@ -57 +59 @@
 
 #endif
+
+#endif

trunk/WebCore/storage/SQLResultSetRowList.idl

@@ -29 +29 @@
 module storage {
 
-    interface SQLResultSetRowList {
+    interface [
+        Conditional=DATABASE
+    ] SQLResultSetRowList {
         readonly attribute unsigned long length;
         [Custom] DOMObject item(in unsigned long index);

trunk/WebCore/storage/SQLStatementCallback.h

@@ -29 +29 @@
 #define SQLStatementCallback_h
 
+#if ENABLE(DATABASE)
+
 #include <wtf/Threading.h>
 
@@ -44 +46 @@
 }
 
+#endif
+
 #endif // SQLStatementErrorCallback_h
-
-

trunk/WebCore/storage/SQLStatementErrorCallback.h

@@ -30 +30 @@
 #define SQLStatementErrorCallback_h
 
+#if ENABLE(DATABASE)
+
 #include <wtf/Threading.h>
 
@@ -45 +47 @@
 }
 
+#endif
+
 #endif // SQLStatementErrorCallback_h
-
-

trunk/WebCore/storage/SQLTransactionCallback.h

@@ -30 +30 @@
 #define SQLTransactionCallback_h
 
+#if ENABLE(DATABASE)
+
 #include <wtf/Threading.h>
 
@@ -45 +47 @@
 }
 
+#endif
+
 #endif // SQLTransactionCallback_h

trunk/WebCore/storage/SQLTransactionErrorCallback.h

@@ -30 +30 @@
 #define SQLTransactionErrorCallback_h
 
+#if ENABLE(DATABASE)
+
 #include <wtf/Threading.h>
 
@@ -44 +46 @@
 }
 
+#endif
+
 #endif // SQLTransactionErrorCallback_h