diff options
| author | Ben Murdoch <benm@google.com> | 2009-05-13 17:58:43 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-05-15 11:38:01 +0100 |
| commit | 8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d (patch) | |
| tree | ad83ccc3e517a60955ebedbfc855a4a97558f508 /WebKit/gtk | |
| parent | 8fe05189c51b0ae29ba6f8c9d4c86fa288110707 (diff) | |
| download | external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.zip external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.gz external_webkit-8ccf722629b08f2a06b2cadbdc3d0c9dc885e25d.tar.bz2 | |
Apply fixes for webkit bugs 24776 and 25616 to add ENABLE(DATABASE) guards. This makes the macro work, so ENABLE_DATABASE can be toggled in config.h and the JavaScriptCore.derived.mk or V8Bindings.derived.mk.
Diffstat (limited to 'WebKit/gtk')
| -rw-r--r-- | WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp | 4 | ||||
| -rw-r--r-- | WebKit/gtk/WebCoreSupport/ChromeClientGtk.h | 4 |
2 files changed, 4 insertions, 4 deletions
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*) { } |