8 files changed, 42 insertions, 2 deletions
diff --git a/WebKit/win/ForEachCoClass.h b/WebKit/win/ForEachCoClass.h
index 94976e6..e1eeac1 100644
--- a/WebKit/win/ForEachCoClass.h
+++ b/WebKit/win/ForEachCoClass.h
@@ -31,11 +31,17 @@
 
 #include "ProgIDMacros.h"
 
+#if ENABLE(DATABASE)
+#define WEB_DATABASE_MANAGER(macro) macro(WebDatabaseManager)
+#else
+#define WEB_DATABASE_MANAGER(macro)
+#endif
+
 // Items may only be added to the end of this macro. No items may be removed from it.
 #define FOR_EACH_COCLASS(macro) \
     macro(CFDictionaryPropertyBag) \
     macro(WebCache) \
-    macro(WebDatabaseManager) \
+    WEB_DATABASE_MANAGER(macro) \
     macro(WebDownload) \
     macro(WebError) \
     macro(WebHistory) \
diff --git a/WebKit/win/WebCoreSupport/WebChromeClient.cpp b/WebKit/win/WebCoreSupport/WebChromeClient.cpp
index 9aec24b..45b07cf 100644
--- a/WebKit/win/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebChromeClient.cpp
@@ -506,6 +506,7 @@ void WebChromeClient::print(Frame* frame)
             uiDelegate2->printFrame(m_webView, kit(frame));
 }
 
+#if ENABLE(DATABASE)
 void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseIdentifier)
 {
     COMPtr<WebSecurityOrigin> origin(AdoptCOM, WebSecurityOrigin::createInstance(frame->document()->securityOrigin()));
@@ -540,6 +541,7 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
         }
     }
 }
+#endif
 
 void WebChromeClient::populateVisitedLinks()
 {
diff --git a/WebKit/win/WebCoreSupport/WebChromeClient.h b/WebKit/win/WebCoreSupport/WebChromeClient.h
index cb9f470..44c6107 100644
--- a/WebKit/win/WebCoreSupport/WebChromeClient.h
+++ b/WebKit/win/WebCoreSupport/WebChromeClient.h
@@ -105,7 +105,9 @@ public:
 
     virtual void print(WebCore::Frame*);
 
+#if ENABLE(DATABASE)
     virtual void exceededDatabaseQuota(WebCore::Frame*, const WebCore::String&);
+#endif
 
     virtual void populateVisitedLinks();
 
diff --git a/WebKit/win/WebDatabaseManager.cpp b/WebKit/win/WebDatabaseManager.cpp
index d4974ed..c16a600 100644
--- a/WebKit/win/WebDatabaseManager.cpp
+++ b/WebKit/win/WebDatabaseManager.cpp
@@ -30,6 +30,8 @@
 #include "WebDatabaseManager.h"
 #include "WebKitDLL.h"
 
+#if ENABLE(DATABASE)
+
 #include "CFDictionaryPropertyBag.h"
 #include "COMEnumVariant.h"
 #include "MarshallingHelpers.h"
@@ -364,3 +366,5 @@ void WebKitSetWebDatabasesPathIfNecessary()
 
     pathSet = true;
 }
+
+#endif
diff --git a/WebKit/win/WebDatabaseManager.h b/WebKit/win/WebDatabaseManager.h
index 303f1e8..f7084ba 100644
--- a/WebKit/win/WebDatabaseManager.h
+++ b/WebKit/win/WebDatabaseManager.h
@@ -29,6 +29,8 @@
 #ifndef WebDatabaseManager_h
 #define WebDatabaseManager_h
 
+#if ENABLE(DATABASE)
+
 #include <WebCore/DatabaseTrackerClient.h>
 
 #include "WebKit.h"
@@ -85,3 +87,5 @@ private:
 void WebKitSetWebDatabasesPathIfNecessary();
 
 #endif
+
+#endif
diff --git a/WebKit/win/WebSecurityOrigin.cpp b/WebKit/win/WebSecurityOrigin.cpp
index c027b13..baec72e 100644
--- a/WebKit/win/WebSecurityOrigin.cpp
+++ b/WebKit/win/WebSecurityOrigin.cpp
@@ -33,6 +33,10 @@
 #include <WebCore/BString.h>
 #include <WebCore/DatabaseTracker.h>
 
+#if !ENABLE(DATABASE)
+#include <wtf/UnusedParam.h>
+#endif
+
 using namespace WebCore;
 
 // WebSecurityOrigin ---------------------------------------------------------------
@@ -126,28 +130,43 @@ HRESULT STDMETHODCALLTYPE WebSecurityOrigin::port(
 HRESULT STDMETHODCALLTYPE WebSecurityOrigin::usage( 
     /* [retval][out] */ unsigned long long* result)
 {
+#if ENABLE(DATABASE)
     if (!result)
         return E_POINTER;
 
     *result = DatabaseTracker::tracker().usageForOrigin(m_securityOrigin.get());
 
     return S_OK;
+#else
+    UNUSED_PARAM(result);
+    return E_NOTIMPL;
+#endif
 }
         
 HRESULT STDMETHODCALLTYPE WebSecurityOrigin::quota( 
     /* [retval][out] */ unsigned long long* result)
 {
+#if ENABLE(DATABASE)
     if (!result)
         return E_POINTER;
 
     *result = DatabaseTracker::tracker().quotaForOrigin(m_securityOrigin.get());
     return S_OK;
+#else
+    UNUSED_PARAM(result);
+    return E_NOTIMPL;
+#endif
 }
         
 HRESULT STDMETHODCALLTYPE WebSecurityOrigin::setQuota( 
     /* [in] */ unsigned long long quota) 
 {
+#if ENABLE(DATABASE)
     DatabaseTracker::tracker().setQuota(m_securityOrigin.get(), quota);
 
     return S_OK;
+#else
+    UNUSED_PARAM(quota);
+    return E_NOTIMPL;
+#endif
 }
diff --git a/WebKit/win/WebSecurityOrigin.h b/WebKit/win/WebSecurityOrigin.h
index a4d9f01..368a7e8 100644
--- a/WebKit/win/WebSecurityOrigin.h
+++ b/WebKit/win/WebSecurityOrigin.h
@@ -57,7 +57,7 @@ public:
         
     virtual HRESULT STDMETHODCALLTYPE port( 
         /* [retval][out] */ unsigned short* result);
-        
+
     virtual HRESULT STDMETHODCALLTYPE usage( 
         /* [retval][out] */ unsigned long long* result);
         
@@ -66,6 +66,7 @@ public:
         
     virtual HRESULT STDMETHODCALLTYPE setQuota( 
         /* [in] */ unsigned long long quota);
+
 private:
     WebSecurityOrigin(WebCore::SecurityOrigin*);
     ~WebSecurityOrigin();
diff --git a/WebKit/win/WebView.cpp b/WebKit/win/WebView.cpp
index 20c43fd..afacef5 100644
--- a/WebKit/win/WebView.cpp
+++ b/WebKit/win/WebView.cpp
@@ -2168,7 +2168,9 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
     m_preferences = sharedPreferences;
 
     InitializeLoggingChannelsIfNecessary();
+#if ENABLE(DATABASE)
     WebKitSetWebDatabasesPathIfNecessary();
+#endif
     WebKitSetApplicationCachePathIfNecessary();
     
     m_page = new Page(new WebChromeClient(this), new WebContextMenuClient(this), new WebEditorClient(this), new WebDragClient(this), new WebInspectorClient(this));