diff options
author | Selim Gurun <sgurun@google.com> | 2012-04-09 16:43:55 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-09 16:43:55 -0700 |
commit | 04ea32d2a76ad3bc3bf87474369a8517aabc3854 (patch) | |
tree | bf24a01ed557381e0f4ae6da97480197a4438d25 /Source/WebKit/android/jni/WebSettings.cpp | |
parent | a27bd0863d1429c04ab4b6a71ee477b33ca333b9 (diff) | |
parent | 68c1e19ccf6ea08208332b6cd19fadc5716159f5 (diff) | |
download | external_webkit-04ea32d2a76ad3bc3bf87474369a8517aabc3854.zip external_webkit-04ea32d2a76ad3bc3bf87474369a8517aabc3854.tar.gz external_webkit-04ea32d2a76ad3bc3bf87474369a8517aabc3854.tar.bz2 |
Merge "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, 0 insertions, 15 deletions
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index 7ee9033..cec44c1 100644 --- a/Source/WebKit/android/jni/WebSettings.cpp +++ b/Source/WebKit/android/jni/WebSettings.cpp @@ -93,8 +93,6 @@ 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) @@ -172,10 +170,6 @@ 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"); @@ -223,8 +217,6 @@ struct FieldIds { #endif jfieldID mBlockNetworkLoads; jfieldID mJavaScriptEnabled; - jfieldID mAllowUniversalAccessFromFileURLs; - jfieldID mAllowFileAccessFromFileURLs; jfieldID mPluginState; #if ENABLE(OFFLINE_WEB_APPLICATIONS) jfieldID mAppCacheEnabled; @@ -414,13 +406,6 @@ 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. |