Index: android_webview/java/src/org/chromium/android_webview/AwSettings.java |
diff --git a/android_webview/java/src/org/chromium/android_webview/AwSettings.java b/android_webview/java/src/org/chromium/android_webview/AwSettings.java |
index a49d01c85f44154ef9fd0c4559bd6c7e8b56a5f5..355571ee6cdc7b6d41f78013e3662c925e00c0cb 100644 |
--- a/android_webview/java/src/org/chromium/android_webview/AwSettings.java |
+++ b/android_webview/java/src/org/chromium/android_webview/AwSettings.java |
@@ -94,6 +94,7 @@ public class AwSettings { |
private final boolean mSupportLegacyQuirks; |
private final boolean mAllowEmptyDocumentPersistence; |
private final boolean mAllowGeolocationOnInsecureOrigins; |
+ private final boolean mDoNotUpdateSelectionOnMutatingSelectionRange; |
private final boolean mPasswordEchoEnabled; |
@@ -204,11 +205,10 @@ public class AwSettings { |
boolean supportsDoubleTapZoom, boolean supportsMultiTouchZoom); |
} |
- public AwSettings(Context context, |
- boolean isAccessFromFileURLsGrantedByDefault, |
- boolean supportsLegacyQuirks, |
- boolean allowEmptyDocumentPersistence, |
- boolean allowGeolocationOnInsecureOrigins) { |
+ public AwSettings(Context context, boolean isAccessFromFileURLsGrantedByDefault, |
+ boolean supportsLegacyQuirks, boolean allowEmptyDocumentPersistence, |
+ boolean allowGeolocationOnInsecureOrigins, |
+ boolean doNotUpdateSelectionOnMutatingSelectionRange) { |
boolean hasInternetPermission = context.checkPermission( |
android.Manifest.permission.INTERNET, |
Process.myPid(), |
@@ -239,6 +239,8 @@ public class AwSettings { |
mSupportLegacyQuirks = supportsLegacyQuirks; |
mAllowEmptyDocumentPersistence = allowEmptyDocumentPersistence; |
mAllowGeolocationOnInsecureOrigins = allowGeolocationOnInsecureOrigins; |
+ mDoNotUpdateSelectionOnMutatingSelectionRange = |
+ doNotUpdateSelectionOnMutatingSelectionRange; |
} |
// Defer initializing the native side until a native WebContents instance is set. |
} |
@@ -1260,6 +1262,12 @@ public class AwSettings { |
return mAllowGeolocationOnInsecureOrigins; |
} |
+ @CalledByNative |
+ private boolean getDoNotUpdateSelectionOnMutatingSelectionRange() { |
+ assert Thread.holdsLock(mAwSettingsLock); |
+ return mDoNotUpdateSelectionOnMutatingSelectionRange; |
+ } |
+ |
/** |
* See {@link android.webkit.WebSettings#setUseWideViewPort}. |
*/ |