summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-03-22 03:44:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-22 03:44:14 -0700
commit343ec940062f940a47d74fc359b661de8be2f3b8 (patch)
treef717ea5d51478e61b064582e9c90439c8c181589 /WebKit
parentb1767e30bfb2da61d9ac83dd2d9963045232acb6 (diff)
parent98f3b258e376b7fd032d25e38e797a1d52d411b4 (diff)
downloadexternal_webkit-343ec940062f940a47d74fc359b661de8be2f3b8.zip
external_webkit-343ec940062f940a47d74fc359b661de8be2f3b8.tar.gz
external_webkit-343ec940062f940a47d74fc359b661de8be2f3b8.tar.bz2
Merge "Implements layoutTestController.setAppCacheMaximumSize"
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebStorage.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp
index 3ab16fd..37792f6 100644
--- a/WebKit/android/jni/WebStorage.cpp
+++ b/WebKit/android/jni/WebStorage.cpp
@@ -132,6 +132,11 @@ static void DeleteAllData(JNIEnv* env, jobject obj)
WebCore::cacheStorage().empty();
}
+static void SetAppCacheMaximumSize(JNIEnv* env, jobject obj, unsigned long long size)
+{
+ WebCore::cacheStorage().setMaximumSize(size);
+}
+
/*
* JNI registration
*/
@@ -147,7 +152,9 @@ static JNINativeMethod gWebStorageMethods[] = {
{ "nativeDeleteOrigin", "(Ljava/lang/String;)V",
(void*) DeleteOrigin },
{ "nativeDeleteAllData", "()V",
- (void*) DeleteAllData }
+ (void*) DeleteAllData },
+ { "nativeSetAppCacheMaximumSize", "(J)V",
+ (void*) SetAppCacheMaximumSize }
};
int register_webstorage(JNIEnv* env)