diff options
| author | Geremy Condra <gcondra@google.com> | 2012-06-11 16:53:16 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-11 16:53:16 -0700 |
| commit | 31874a9d49b110cd82de0efc5eab2c9cddcddde1 (patch) | |
| tree | cb03922f96bff6c8cdb50b6cebb74fb3fe073151 /Source/WebKit/android | |
| parent | 70acd61e5231166f74d58e5de9560e06dec5145c (diff) | |
| parent | deb1cf5e77135ead2a3a6ed4db22aafa408c9849 (diff) | |
| download | external_webkit-31874a9d49b110cd82de0efc5eab2c9cddcddde1.zip external_webkit-31874a9d49b110cd82de0efc5eab2c9cddcddde1.tar.gz external_webkit-31874a9d49b110cd82de0efc5eab2c9cddcddde1.tar.bz2 | |
Merge "DO NOT MERGE Add webkit plumbing for file origin policy"
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/jni/WebSettings.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index 589615d..fdd0cb1 100644 --- a/Source/WebKit/android/jni/WebSettings.cpp +++ b/Source/WebKit/android/jni/WebSettings.cpp @@ -95,6 +95,8 @@ struct FieldIds { #endif mBlockNetworkLoads = env->GetFieldID(clazz, "mBlockNetworkLoads", "Z"); mJavaScriptEnabled = env->GetFieldID(clazz, "mJavaScriptEnabled", "Z"); + mAllowUniversalAccessFromFileURLs = env->GetFieldID(clazz, "mAllowUniversalAccessFromFileURLs", "Z"); + mAllowFileAccessFromFileURLs = env->GetFieldID(clazz, "mAllowFileAccessFromFileURLs", "Z"); mPluginState = env->GetFieldID(clazz, "mPluginState", "Landroid/webkit/WebSettings$PluginState;"); #if ENABLE(DATABASE) @@ -171,6 +173,10 @@ struct FieldIds { #endif LOG_ASSERT(mBlockNetworkLoads, "Could not find field mBlockNetworkLoads"); LOG_ASSERT(mJavaScriptEnabled, "Could not find field mJavaScriptEnabled"); + LOG_ASSERT(mAllowUniversalAccessFromFileURLs, + "Could not find field mAllowUniversalAccessFromFileURLs"); + LOG_ASSERT(mAllowFileAccessFromFileURLs, + "Could not find field mAllowFileAccessFromFileURLs"); LOG_ASSERT(mPluginState, "Could not find field mPluginState"); #if ENABLE(OFFLINE_WEB_APPLICATIONS) LOG_ASSERT(mAppCacheEnabled, "Could not find field mAppCacheEnabled"); @@ -218,6 +224,8 @@ struct FieldIds { #endif jfieldID mBlockNetworkLoads; jfieldID mJavaScriptEnabled; + jfieldID mAllowUniversalAccessFromFileURLs; + jfieldID mAllowFileAccessFromFileURLs; jfieldID mPluginState; #if ENABLE(OFFLINE_WEB_APPLICATIONS) jfieldID mAppCacheEnabled; @@ -409,6 +417,12 @@ public: flag = env->GetBooleanField(obj, gFieldIds->mJavaScriptEnabled); s->setJavaScriptEnabled(flag); + flag = env->GetBooleanField(obj, gFieldIds->mAllowUniversalAccessFromFileURLs); + s->setAllowUniversalAccessFromFileURLs(flag); + + flag = env->GetBooleanField(obj, gFieldIds->mAllowFileAccessFromFileURLs); + s->setAllowFileAccessFromFileURLs(flag); + // ON = 0 // ON_DEMAND = 1 // OFF = 2 |