diff options
| author | Selim Gurun <sgurun@google.com> | 2012-04-19 17:01:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-19 17:01:00 -0700 |
| commit | dac0ff7c1189c780fd6b00abfe28dd4c09094a86 (patch) | |
| tree | aad12d0129a4987e19b25e0f4a10fede6146431f /Source/WebKit/android/jni/WebSettings.cpp | |
| parent | 7ad2efca85a989d9ab57e311af605a6fed9c9925 (diff) | |
| parent | e034fd638a65bd6d7fc0078857decad09fc631c1 (diff) | |
| download | external_webkit-dac0ff7c1189c780fd6b00abfe28dd4c09094a86.zip external_webkit-dac0ff7c1189c780fd6b00abfe28dd4c09094a86.tar.gz external_webkit-dac0ff7c1189c780fd6b00abfe28dd4c09094a86.tar.bz2 | |
Merge "Revert "Revert "Add webkit plumbing for file origin policy"""
Diffstat (limited to 'Source/WebKit/android/jni/WebSettings.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/WebSettings.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index cec44c1..7ee9033 100644 --- a/Source/WebKit/android/jni/WebSettings.cpp +++ b/Source/WebKit/android/jni/WebSettings.cpp @@ -93,6 +93,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) @@ -170,6 +172,10 @@ struct FieldIds { #endif ALOG_ASSERT(mBlockNetworkLoads, "Could not find field mBlockNetworkLoads"); ALOG_ASSERT(mJavaScriptEnabled, "Could not find field mJavaScriptEnabled"); + ALOG_ASSERT(mAllowUniversalAccessFromFileURLs, + "Could not find field mAllowUniversalAccessFromFileURLs"); + ALOG_ASSERT(mAllowFileAccessFromFileURLs, + "Could not find field mAllowFileAccessFromFileURLs"); ALOG_ASSERT(mPluginState, "Could not find field mPluginState"); #if ENABLE(OFFLINE_WEB_APPLICATIONS) ALOG_ASSERT(mAppCacheEnabled, "Could not find field mAppCacheEnabled"); @@ -217,6 +223,8 @@ struct FieldIds { #endif jfieldID mBlockNetworkLoads; jfieldID mJavaScriptEnabled; + jfieldID mAllowUniversalAccessFromFileURLs; + jfieldID mAllowFileAccessFromFileURLs; jfieldID mPluginState; #if ENABLE(OFFLINE_WEB_APPLICATIONS) jfieldID mAppCacheEnabled; @@ -406,6 +414,13 @@ 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); + // Hyperlink auditing (the ping attribute) has similar privacy // considerations as does the running of JavaScript, so to keep the UI // simpler, we leverage the same setting. |