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/android/WebCoreSupport/ChromeClientAndroid.cpp | |
| 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/android/WebCoreSupport/ChromeClientAndroid.cpp')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 4 |
1 files changed, 2 insertions, 2 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(); } |