summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorElliott Slaughter <eds@google.com>2010-07-15 11:41:04 -0700
committerElliott Slaughter <eds@google.com>2010-08-04 11:04:39 -0700
commit42869a26b8c45f087dbed2a2d6dbc8f780e8f9bf (patch)
tree7c9cad876a0baea8e985df47047a86dc3bdd57da /WebKit
parentd90694237e0403668232924a79fabfb3d1214e6c (diff)
downloadexternal_webkit-42869a26b8c45f087dbed2a2d6dbc8f780e8f9bf.zip
external_webkit-42869a26b8c45f087dbed2a2d6dbc8f780e8f9bf.tar.gz
external_webkit-42869a26b8c45f087dbed2a2d6dbc8f780e8f9bf.tar.bz2
Initial work on browser incognito mode history feature.
Change-Id: I08ccbef18a53660fd9c22e1e2160be7de1733db1
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebSettings.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index d9a7cf0..4c524dc 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -116,6 +116,7 @@ struct FieldIds {
mSupportMultipleWindows = env->GetFieldID(clazz, "mSupportMultipleWindows", "Z");
mShrinksStandaloneImagesToFit = env->GetFieldID(clazz, "mShrinksStandaloneImagesToFit", "Z");
mMaximumDecodedImageSize = env->GetFieldID(clazz, "mMaximumDecodedImageSize", "J");
+ mPrivateBrowsingEnabled = env->GetFieldID(clazz, "mPrivateBrowsingEnabled", "Z");
mUseDoubleTree = env->GetFieldID(clazz, "mUseDoubleTree", "Z");
mPageCacheCapacity = env->GetFieldID(clazz, "mPageCacheCapacity", "I");
@@ -199,6 +200,7 @@ struct FieldIds {
jfieldID mSupportMultipleWindows;
jfieldID mShrinksStandaloneImagesToFit;
jfieldID mMaximumDecodedImageSize;
+ jfieldID mPrivateBrowsingEnabled;
jfieldID mUseDoubleTree;
jfieldID mPageCacheCapacity;
// Ordinal() method and value field for enums
@@ -363,6 +365,10 @@ public:
if (maxImage == 0)
maxImage = computeMaxBitmapSizeForCache();
s->setMaximumDecodedImageSize(maxImage);
+
+ flag = env->GetBooleanField(obj, gFieldIds->mPrivateBrowsingEnabled);
+ s->setPrivateBrowsingEnabled(flag);
+
#if ENABLE(DATABASE)
flag = env->GetBooleanField(obj, gFieldIds->mDatabaseEnabled);
WebCore::Database::setIsAvailable(flag);