From 68c1e19ccf6ea08208332b6cd19fadc5716159f5 Mon Sep 17 00:00:00 2001 From: Selim Gurun Date: Mon, 9 Apr 2012 16:42:18 -0700 Subject: Revert "Add webkit plumbing for file origin policy" This reverts commit 960271d799b3ee4b8de483109435a9092d99c468 --- Source/WebKit/android/jni/WebSettings.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'Source/WebKit/android/jni/WebSettings.cpp') diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp index 5ce1ccc..65ac360 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) @@ -169,10 +167,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"); @@ -220,8 +214,6 @@ struct FieldIds { #endif jfieldID mBlockNetworkLoads; jfieldID mJavaScriptEnabled; - jfieldID mAllowUniversalAccessFromFileURLs; - jfieldID mAllowFileAccessFromFileURLs; jfieldID mPluginState; #if ENABLE(OFFLINE_WEB_APPLICATIONS) jfieldID mAppCacheEnabled; @@ -408,13 +400,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. -- cgit v1.1