From deb1cf5e77135ead2a3a6ed4db22aafa408c9849 Mon Sep 17 00:00:00 2001
From: Selim Gurun <sgurun@google.com>
Date: Thu, 29 Mar 2012 18:12:09 -0700
Subject: DO NOT MERGE Add webkit plumbing for file origin policy

Bug: 6212665

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

(cherry picked from commit 57633fd9f863f5e1e4ce8fab0eb05ddb535e1be6)

Change-Id: I9c2fa81aa3e16d39ed79d171ae09b1f99d9e7082
---
 Source/WebKit/android/jni/WebSettings.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(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 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
-- 
cgit v1.1