Skip to content
This repository has been archived by the owner on Jul 30, 2022. It is now read-only.

Commit

Permalink
DO NOT MERGE Add webkit plumbing for file origin policy
Browse files Browse the repository at this point in the history
Bug: 6212665

This is a cherry-pick from master branch. sha:
     0ea6dad65eb77f9347a59704b1f8a019cfc9e01f

(cherry picked from commit 57633fd)

Change-Id: I9c2fa81aa3e16d39ed79d171ae09b1f99d9e7082
  • Loading branch information
Selim Gurun authored and gcondra committed Jun 7, 2012
1 parent 70acd61 commit deb1cf5
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions Source/WebKit/android/jni/WebSettings.cpp
Expand Up @@ -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)
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -218,6 +224,8 @@ struct FieldIds {
#endif
jfieldID mBlockNetworkLoads;
jfieldID mJavaScriptEnabled;
jfieldID mAllowUniversalAccessFromFileURLs;
jfieldID mAllowFileAccessFromFileURLs;
jfieldID mPluginState;
#if ENABLE(OFFLINE_WEB_APPLICATIONS)
jfieldID mAppCacheEnabled;
Expand Down Expand Up @@ -409,6 +417,12 @@ class WebSettings {
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
Expand Down

0 comments on commit deb1cf5

Please sign in to comment.