diff options
| author | Cary Clark <cary@android.com> | 2010-09-01 10:13:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-01 10:13:56 -0700 |
| commit | 312087523aea90b1b42c0c9b105ec9be8224df12 (patch) | |
| tree | b6869215f9a5352acf53680d6ef60b923bf2d53b /WebKit | |
| parent | 0791b1868c46ccb65512ac34b0fc06c43759eda9 (diff) | |
| parent | 6bb45a504d0c8695fdc5d5580b3aba49db3086d7 (diff) | |
| download | external_webkit-312087523aea90b1b42c0c9b105ec9be8224df12.zip external_webkit-312087523aea90b1b42c0c9b105ec9be8224df12.tar.gz external_webkit-312087523aea90b1b42c0c9b105ec9be8224df12.tar.bz2 | |
Merge "add web setting for enabling/disabling synthetic links"
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 7 |
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); |