2007-11-08 Justin Haygood <jhaygood@reaktix.com>
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Nov 2007 03:13:19 +0000 (03:13 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Nov 2007 03:13:19 +0000 (03:13 +0000)
        Reviewed by Mark Rowe.

        http://bugs.webkit.org/show_bug.cgi?id=15905

        Fix builds with HTML 5 Storage support disabled.
        ENABLE(DATABASE) needs to be added in a few places.

        * page/InspectorController.cpp:
        * storage/Database.h:

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

WebCore/ChangeLog
WebCore/page/InspectorController.cpp
WebCore/storage/Database.h

index 66cfe10..ddcf092 100644 (file)
@@ -1,3 +1,15 @@
+2007-11-08  Justin Haygood  <jhaygood@reaktix.com>
+
+        Reviewed by Mark Rowe.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15905
+
+        Fix builds with HTML 5 Storage support disabled.
+        ENABLE(DATABASE) needs to be added in a few places.
+
+        * page/InspectorController.cpp:
+        * storage/Database.h:
+
 2007-11-08  Steve Falkenburg  <sfalken@apple.com>
 
         <rdar://problem/5524082> Allow images to be dragged out directly into other apps
index 617cac9..adc7a6f 100644 (file)
@@ -200,7 +200,7 @@ struct InspectorResource : public Shared<InspectorResource> {
     double endTime;
 };
 
-
+#if ENABLE(DATABASE)
 struct InspectorDatabaseResource : public Shared<InspectorDatabaseResource> {
     InspectorDatabaseResource(Database* database, String domain, String name, String version)
         : database(database)
@@ -237,6 +237,7 @@ struct InspectorDatabaseResource : public Shared<InspectorDatabaseResource> {
     JSContextRef scriptContext;
     JSObjectRef scriptObject;
 };
+#endif
 
 static JSValueRef addSourceToFrame(JSContextRef ctx, JSObjectRef /*function*/, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* /*exception*/)
 {
index c57ab29..c67c091 100644 (file)
@@ -29,6 +29,8 @@
 #ifndef Database_h
 #define Database_h
 
+#if ENABLE(DATABASE)
+
 #include "PlatformString.h"
 #include "SecurityOrigin.h"
 #include "SQLiteDatabase.h"
@@ -143,4 +145,6 @@ private:
 
 } // namespace WebCore
 
+#endif
+
 #endif // Database_h