diff options
Diffstat (limited to 'WebKit')
31 files changed, 130 insertions, 20 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index 4191d85..c4ff2f0 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -272,9 +272,9 @@ void ChromeClientAndroid::print(Frame*) {} * we call into the browser thread to ask what to do with the quota, we block here and get woken up when the * browser calls the native WebViewCore::SetDatabaseQuota method with the new quota value. */ +#if ENABLE(DATABASE) void ChromeClientAndroid::exceededDatabaseQuota(Frame* frame, const String& name) { -#if ENABLE(DATABASE) SecurityOrigin* origin = frame->document()->securityOrigin(); // TODO: This default quota value should be pulled from the web browser @@ -306,8 +306,8 @@ void ChromeClientAndroid::exceededDatabaseQuota(Frame* frame, const String& name // to the default quota, casusing it to be tracked from now on. DatabaseTracker::tracker().setQuota(origin, defaultQuota); } -#endif } +#endif // new to change 38068 (Nov 6, 2008) void ChromeClientAndroid::runOpenPanel(Frame*, PassRefPtr<FileChooser>) { notImplemented(); } diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h index 7ffafcd..00c45b9 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.h +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.h @@ -107,9 +107,9 @@ namespace android { virtual void setToolTip(const String&); virtual void print(Frame*); - +#if ENABLE(DATABASE) virtual void exceededDatabaseQuota(Frame*, const String&); - +#endif virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); // Notification that the given form element has changed. This function diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp index f3f6efa..c6b0022 100644 --- a/WebKit/android/jni/WebCoreJniOnLoad.cpp +++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp @@ -24,6 +24,8 @@ */ #define LOG_TAG "webcoreglue" +#include "config.h" + #include "jni_utility.h" #include <jni.h> #include <utils/Log.h> @@ -37,10 +39,13 @@ extern int register_webviewcore(JNIEnv*); extern int register_webhistory(JNIEnv*); extern int register_webicondatabase(JNIEnv*); extern int register_websettings(JNIEnv*); -extern int register_webstorage(JNIEnv*); extern int register_webview(JNIEnv*); extern int register_webcorejni(JNIEnv*); +#if ENABLE(DATABASE) +extern int register_webstorage(JNIEnv*); +#endif + } struct RegistrationMethod { @@ -57,7 +62,9 @@ static RegistrationMethod gWebCoreRegMethods[] = { { "WebHistory", android::register_webhistory }, { "WebIconDatabase", android::register_webicondatabase }, { "WebSettings", android::register_websettings }, +#if ENABLE(DATABASE) { "WebStorage", android::register_webstorage }, +#endif { "WebView", android::register_webview } }; diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp index d375f3e..f625939 100644 --- a/WebKit/android/jni/WebStorage.cpp +++ b/WebKit/android/jni/WebStorage.cpp @@ -23,8 +23,9 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <config.h> -#include <wtf/Platform.h> +#include "config.h" + +#if ENABLE(DATABASE) #include <JNIHelp.h> @@ -122,3 +123,6 @@ int register_webstorage(JNIEnv* env) } } + +#endif //ENABLE(DATABASE) + diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp index 85f704a..892be74 100644 --- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp @@ -407,16 +407,16 @@ void ChromeClient::print(Frame* frame) webkit_web_frame_print(kit(frame)); } +#if ENABLE(DATABASE) void ChromeClient::exceededDatabaseQuota(Frame* frame, const String&) { -#if ENABLE(DATABASE) // Set to 5M for testing // FIXME: Make this configurable notImplemented(); const unsigned long long defaultQuota = 5 * 1024 * 1024; DatabaseTracker::tracker().setQuota(frame->document()->securityOrigin(), defaultQuota); -#endif } +#endif void ChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChooser) { diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h index 299d023..fc0ea8a 100644 --- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h @@ -96,9 +96,9 @@ namespace WebKit { virtual void setToolTip(const WebCore::String&); virtual void print(WebCore::Frame*); - +#if ENABLE(DATABASE) virtual void exceededDatabaseQuota(WebCore::Frame*, const WebCore::String&); - +#endif virtual void runOpenPanel(WebCore::Frame*, PassRefPtr<WebCore::FileChooser>); virtual void formStateDidChange(const WebCore::Node*) { } diff --git a/WebKit/mac/Storage/WebDatabaseManager.mm b/WebKit/mac/Storage/WebDatabaseManager.mm index fa9eea6..a84f235 100644 --- a/WebKit/mac/Storage/WebDatabaseManager.mm +++ b/WebKit/mac/Storage/WebDatabaseManager.mm @@ -29,6 +29,8 @@ #import "WebDatabaseManagerPrivate.h" #import "WebDatabaseManagerInternal.h" +#if ENABLE(DATABASE) + #import "WebDatabaseTrackerClient.h" #import "WebSecurityOriginInternal.h" @@ -137,3 +139,5 @@ void WebKitInitializeDatabasesIfNecessary() initialized = YES; } + +#endif diff --git a/WebKit/mac/Storage/WebDatabaseManagerInternal.h b/WebKit/mac/Storage/WebDatabaseManagerInternal.h index 2065a4e..6a4ad1d 100644 --- a/WebKit/mac/Storage/WebDatabaseManagerInternal.h +++ b/WebKit/mac/Storage/WebDatabaseManagerInternal.h @@ -26,4 +26,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if ENABLE(DATABASE) + void WebKitInitializeDatabasesIfNecessary(); + +#endif diff --git a/WebKit/mac/Storage/WebDatabaseManagerPrivate.h b/WebKit/mac/Storage/WebDatabaseManagerPrivate.h index faa4e5d..e373b1c 100644 --- a/WebKit/mac/Storage/WebDatabaseManagerPrivate.h +++ b/WebKit/mac/Storage/WebDatabaseManagerPrivate.h @@ -26,6 +26,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if ENABLE(DATABASE) + extern NSString *WebDatabaseDirectoryDefaultsKey; extern NSString *WebDatabaseDisplayNameKey; @@ -62,3 +64,5 @@ extern NSString *WebDatabaseIdentifierKey; - (void)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin; @end + +#endif diff --git a/WebKit/mac/Storage/WebDatabaseTrackerClient.h b/WebKit/mac/Storage/WebDatabaseTrackerClient.h index 5db444c..d06cfe9 100644 --- a/WebKit/mac/Storage/WebDatabaseTrackerClient.h +++ b/WebKit/mac/Storage/WebDatabaseTrackerClient.h @@ -26,6 +26,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#if ENABLE(DATABASE) + #import <WebCore/DatabaseTrackerClient.h> class WebDatabaseTrackerClient : public WebCore::DatabaseTrackerClient { @@ -38,3 +40,5 @@ public: private: WebDatabaseTrackerClient(); }; + +#endif diff --git a/WebKit/mac/Storage/WebDatabaseTrackerClient.mm b/WebKit/mac/Storage/WebDatabaseTrackerClient.mm index 48530d6..89626fb 100644 --- a/WebKit/mac/Storage/WebDatabaseTrackerClient.mm +++ b/WebKit/mac/Storage/WebDatabaseTrackerClient.mm @@ -28,6 +28,8 @@ #import "WebDatabaseTrackerClient.h" +#if ENABLE(DATABASE) + #import "WebDatabaseManagerPrivate.h" #import "WebSecurityOriginInternal.h" #import <wtf/RetainPtr.h> @@ -67,3 +69,5 @@ void WebDatabaseTrackerClient::dispatchDidModifyDatabase(SecurityOrigin* origin, object:webSecurityOrigin.get() userInfo:userInfo.get()]; } + +#endif diff --git a/WebKit/mac/Storage/WebSecurityOrigin.mm b/WebKit/mac/Storage/WebSecurityOrigin.mm index 85313d0..56a21f5 100644 --- a/WebKit/mac/Storage/WebSecurityOrigin.mm +++ b/WebKit/mac/Storage/WebSecurityOrigin.mm @@ -71,12 +71,20 @@ using namespace WebCore; - (unsigned long long)usage { +#if ENABLE(DATABASE) return DatabaseTracker::tracker().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private)); +#else + return 0; +#endif } - (unsigned long long)quota { +#if ENABLE(DATABASE) return DatabaseTracker::tracker().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private)); +#else + return 0; +#endif } // Sets the storage quota (in bytes) @@ -84,7 +92,9 @@ using namespace WebCore; // This will simply prevent new data from being added to databases in that origin - (void)setQuota:(unsigned long long)quota { +#if ENABLE(DATABASE) DatabaseTracker::tracker().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota); +#endif } - (BOOL)isEqual:(id)anObject diff --git a/WebKit/mac/Storage/WebSecurityOriginPrivate.h b/WebKit/mac/Storage/WebSecurityOriginPrivate.h index 0796c6e..c7836f8 100644 --- a/WebKit/mac/Storage/WebSecurityOriginPrivate.h +++ b/WebKit/mac/Storage/WebSecurityOriginPrivate.h @@ -49,4 +49,5 @@ // This will simply prevent new data from being added to databases in that origin - (void)setQuota:(unsigned long long)quota; + @end diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.h b/WebKit/mac/WebCoreSupport/WebChromeClient.h index b2f04f1..6c3d71e 100644 --- a/WebKit/mac/WebCoreSupport/WebChromeClient.h +++ b/WebKit/mac/WebCoreSupport/WebChromeClient.h @@ -104,9 +104,9 @@ public: virtual void setToolTip(const WebCore::String&); virtual void print(WebCore::Frame*); - +#if ENABLE(DATABASE) virtual void exceededDatabaseQuota(WebCore::Frame*, const WebCore::String& databaseName); - +#endif virtual void populateVisitedLinks(); #if ENABLE(DASHBOARD_SUPPORT) diff --git a/WebKit/mac/WebCoreSupport/WebChromeClient.mm b/WebKit/mac/WebCoreSupport/WebChromeClient.mm index 79dd641..18c73e9 100644 --- a/WebKit/mac/WebCoreSupport/WebChromeClient.mm +++ b/WebKit/mac/WebCoreSupport/WebChromeClient.mm @@ -500,6 +500,7 @@ void WebChromeClient::print(Frame* frame) CallUIDelegate(m_webView, @selector(webView:printFrameView:), frameView); } +#if ENABLE(DATABASE) void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& databaseName) { BEGIN_BLOCK_OBJC_EXCEPTIONS; @@ -515,6 +516,7 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database END_BLOCK_OBJC_EXCEPTIONS; } +#endif void WebChromeClient::populateVisitedLinks() { diff --git a/WebKit/mac/WebView/WebView.mm b/WebKit/mac/WebView/WebView.mm index de3628a..eabbc9d 100644 --- a/WebKit/mac/WebView/WebView.mm +++ b/WebKit/mac/WebView/WebView.mm @@ -741,7 +741,9 @@ static bool runningTigerMail() WebKitInitializeLoggingChannelsIfNecessary(); WebCore::InitializeLoggingChannelsIfNecessary(); [WebHistoryItem initWindowWatcherIfNecessary]; +#if ENABLE(DATABASE) WebKitInitializeDatabasesIfNecessary(); +#endif WebKitInitializeApplicationCachePathIfNecessary(); patchMailRemoveAttributesMethod(); didOneTimeInitialization = true; diff --git a/WebKit/qt/Api/qwebdatabase.cpp b/WebKit/qt/Api/qwebdatabase.cpp index 489ab17..0203d72 100644 --- a/WebKit/qt/Api/qwebdatabase.cpp +++ b/WebKit/qt/Api/qwebdatabase.cpp @@ -19,6 +19,9 @@ #include "config.h" #include "qwebdatabase.h" + +#if ENABLE(DATABASE) + #include "qwebdatabase_p.h" #include "qwebsecurityorigin.h" #include "qwebsecurityorigin_p.h" @@ -146,3 +149,5 @@ void QWebDatabase::removeDatabase(const QWebDatabase &db) QWebDatabase::~QWebDatabase() { } + +#endif diff --git a/WebKit/qt/Api/qwebdatabase_p.h b/WebKit/qt/Api/qwebdatabase_p.h index 988fb16..145115e 100644 --- a/WebKit/qt/Api/qwebdatabase_p.h +++ b/WebKit/qt/Api/qwebdatabase_p.h @@ -19,6 +19,8 @@ #ifndef _WEBDATABASE_P_H_ #define _WEBDATABASE_P_H_ +#if ENABLE(DATABASE) + #include <QString> #include <QtCore/qshareddata.h> @@ -36,3 +38,5 @@ public: #endif +#endif + diff --git a/WebKit/qt/Api/qwebsecurityorigin.cpp b/WebKit/qt/Api/qwebsecurityorigin.cpp index 5217362..c08785f 100644 --- a/WebKit/qt/Api/qwebsecurityorigin.cpp +++ b/WebKit/qt/Api/qwebsecurityorigin.cpp @@ -101,7 +101,11 @@ int QWebSecurityOrigin::port() const */ qint64 QWebSecurityOrigin::databaseUsage() const { +#if ENABLE(DATABASE) return DatabaseTracker::tracker().usageForOrigin(d->origin.get()); +#else + return 0; +#endif } /*! @@ -109,7 +113,11 @@ qint64 QWebSecurityOrigin::databaseUsage() const */ qint64 QWebSecurityOrigin::databaseQuota() const { +#if ENABLE(DATABASE) return DatabaseTracker::tracker().quotaForOrigin(d->origin.get()); +#else + return 0; +#endif } /*! @@ -121,7 +129,9 @@ qint64 QWebSecurityOrigin::databaseQuota() const */ void QWebSecurityOrigin::setDatabaseQuota(qint64 quota) { +#if ENABLE(DATABASE) DatabaseTracker::tracker().setQuota(d->origin.get(), quota); +#endif } /*! diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp index fa52d6c..5df554b 100644 --- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp +++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp @@ -387,15 +387,17 @@ void ChromeClientQt::print(Frame *frame) emit m_webPage->printRequested(QWebFramePrivate::kit(frame)); } +#if ENABLE(DATABASE) void ChromeClientQt::exceededDatabaseQuota(Frame* frame, const String& databaseName) { quint64 quota = QWebSettings::offlineStorageDefaultQuota(); -#if ENABLE(DATABASE) + if (!DatabaseTracker::tracker().hasEntryForOrigin(frame->document()->securityOrigin())) DatabaseTracker::tracker().setQuota(frame->document()->securityOrigin(), quota); -#endif + emit m_webPage->databaseQuotaExceeded(QWebFramePrivate::kit(frame), databaseName); } +#endif void ChromeClientQt::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> prpFileChooser) { diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/WebKit/qt/WebCoreSupport/ChromeClientQt.h index a13bb7c..77c56fc 100644 --- a/WebKit/qt/WebCoreSupport/ChromeClientQt.h +++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.h @@ -113,9 +113,9 @@ namespace WebCore { virtual void setToolTip(const String&); virtual void print(Frame*); - +#if ENABLE(DATABASE) virtual void exceededDatabaseQuota(Frame*, const String&); - +#endif virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); virtual void formStateDidChange(const Node*) { } 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)); diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp index 29fef0e..6dfe7a4 100644 --- a/WebKit/wx/WebKitSupport/ChromeClientWx.cpp +++ b/WebKit/wx/WebKitSupport/ChromeClientWx.cpp @@ -348,10 +348,12 @@ void ChromeClientWx::print(Frame*) notImplemented(); } +#if ENABLE(DATABASE) void ChromeClientWx::exceededDatabaseQuota(Frame*, const String&) { notImplemented(); } +#endif void ChromeClientWx::scroll(const IntSize&, const IntRect&, const IntRect&) { diff --git a/WebKit/wx/WebKitSupport/ChromeClientWx.h b/WebKit/wx/WebKitSupport/ChromeClientWx.h index 74e0023..df1fdd8 100644 --- a/WebKit/wx/WebKitSupport/ChromeClientWx.h +++ b/WebKit/wx/WebKitSupport/ChromeClientWx.h @@ -110,8 +110,9 @@ public: virtual void print(Frame*); +#if ENABLE(DATABASE) virtual void exceededDatabaseQuota(Frame*, const String&); - +#endif virtual void runOpenPanel(Frame*, PassRefPtr<FileChooser>); virtual void formStateDidChange(const Node*) { } |