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.

4 files changed, 18 insertions, 7 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)
+