summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Slaughter <eds@google.com>2010-06-22 11:34:35 -0700
committerElliott Slaughter <eds@google.com>2010-06-22 11:34:35 -0700
commit261291fef7ca788b3e1282bb2a80f8936d6196ad (patch)
treea0edbe873ba2fbd74050a231b24ef96b2340be33
parente3cd469169e32d71c0bd8cfca4d52854de003cbe (diff)
downloadexternal_webkit-261291fef7ca788b3e1282bb2a80f8936d6196ad.zip
external_webkit-261291fef7ca788b3e1282bb2a80f8936d6196ad.tar.gz
external_webkit-261291fef7ca788b3e1282bb2a80f8936d6196ad.tar.bz2
Added setXSSAuditorEnabled support in WebSettings.
Change-Id: I5a2580314ef866d661c6a1cac08df28ea1e0b54a
-rw-r--r--WebKit/android/jni/WebSettings.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index 7d89c60..912465a 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -108,6 +108,7 @@ struct FieldIds {
#endif
mGeolocationEnabled = env->GetFieldID(clazz, "mGeolocationEnabled", "Z");
mGeolocationDatabasePath = env->GetFieldID(clazz, "mGeolocationDatabasePath", "Ljava/lang/String;");
+ mXSSAuditorEnabled = env->GetFieldID(clazz, "mXSSAuditorEnabled", "Z");
mJavaScriptCanOpenWindowsAutomatically = env->GetFieldID(clazz,
"mJavaScriptCanOpenWindowsAutomatically", "Z");
mUseWideViewport = env->GetFieldID(clazz, "mUseWideViewport", "Z");
@@ -208,6 +209,7 @@ struct FieldIds {
#endif
jfieldID mGeolocationEnabled;
jfieldID mGeolocationDatabasePath;
+ jfieldID mXSSAuditorEnabled;
#if ENABLE(DATABASE) || ENABLE(DOM_STORAGE)
jfieldID mDatabasePath;
jfieldID mDatabasePathHasBeenSet;
@@ -385,6 +387,9 @@ public:
WebCore::GeolocationPositionCache::setDatabasePath(to_string(env,str));
}
+ flag = env->GetBooleanField(obj, gFieldIds->mXSSAuditorEnabled);
+ s->setXSSAuditorEnabled(flag);
+
size = env->GetIntField(obj, gFieldIds->mPageCacheCapacity);
if (size > 0) {
s->setUsesPageCache(true);