summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-08-31 15:45:11 -0400
committerCary Clark <cary@android.com>2010-09-01 10:55:55 -0400
commit6bb45a504d0c8695fdc5d5580b3aba49db3086d7 (patch)
tree733c11daa9ed8512bf8bfb6cc69a8b8c6a63d64a /WebKit
parent0eb2314f8b27b9d07958b55fba1dc7d7264ae86a (diff)
downloadexternal_webkit-6bb45a504d0c8695fdc5d5580b3aba49db3086d7.zip
external_webkit-6bb45a504d0c8695fdc5d5580b3aba49db3086d7.tar.gz
external_webkit-6bb45a504d0c8695fdc5d5580b3aba49db3086d7.tar.bz2
add web setting for enabling/disabling synthetic links
According to this feature request http://b/1865484 Some webviews wish to load pages and ignore the email, phone, and postal addresses. Add a way to specify that preference to the WebView class. depends on companion change in frameworks/base Change-Id: Ibcd78ab632063d8ab403567fa40c329339e51572
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/jni/WebSettings.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index 9b84409..8d4be57 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -119,6 +119,7 @@ struct FieldIds {
mShrinksStandaloneImagesToFit = env->GetFieldID(clazz, "mShrinksStandaloneImagesToFit", "Z");
mMaximumDecodedImageSize = env->GetFieldID(clazz, "mMaximumDecodedImageSize", "J");
mPrivateBrowsingEnabled = env->GetFieldID(clazz, "mPrivateBrowsingEnabled", "Z");
+ mSyntheticLinksEnabled = env->GetFieldID(clazz, "mSyntheticLinksEnabled", "Z");
mUseDoubleTree = env->GetFieldID(clazz, "mUseDoubleTree", "Z");
mPageCacheCapacity = env->GetFieldID(clazz, "mPageCacheCapacity", "I");
@@ -205,6 +206,7 @@ struct FieldIds {
jfieldID mShrinksStandaloneImagesToFit;
jfieldID mMaximumDecodedImageSize;
jfieldID mPrivateBrowsingEnabled;
+ jfieldID mSyntheticLinksEnabled;
jfieldID mUseDoubleTree;
jfieldID mPageCacheCapacity;
// Ordinal() method and value field for enums
@@ -378,6 +380,11 @@ public:
flag = env->GetBooleanField(obj, gFieldIds->mPrivateBrowsingEnabled);
s->setPrivateBrowsingEnabled(flag);
+ flag = env->GetBooleanField(obj, gFieldIds->mSyntheticLinksEnabled);
+ s->setDefaultFormatDetection(flag);
+ s->setFormatDetectionAddress(flag);
+ s->setFormatDetectionEmail(flag);
+ s->setFormatDetectionTelephone(flag);
#if ENABLE(DATABASE)
flag = env->GetBooleanField(obj, gFieldIds->mDatabaseEnabled);
WebCore::Database::setIsAvailable(flag);