| Index: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
|
| index 13aa756e8f9ed9dce4105cc23f939de6f1463569..e8842b52396d3e71954ead417ef05fb4bc85b807 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java
|
| @@ -216,12 +216,12 @@ import java.util.UUID;
|
| }
|
|
|
| @Override
|
| - public void unselect() {
|
| - // Unselect may get triggered when certain selection-related widgets
|
| + public void collapseSelection() {
|
| + // collapseSelection may get triggered when certain selection-related widgets
|
| // are destroyed. As the timing for such destruction is unpredictable,
|
| // safely guard against this case.
|
| if (isDestroyed()) return;
|
| - nativeUnselect(mNativeWebContentsAndroid);
|
| + nativeCollapseSelection(mNativeWebContentsAndroid);
|
| }
|
|
|
| @Override
|
| @@ -567,7 +567,7 @@ import java.util.UUID;
|
| private native void nativePaste(long nativeWebContentsAndroid);
|
| private native void nativeReplace(long nativeWebContentsAndroid, String word);
|
| private native void nativeSelectAll(long nativeWebContentsAndroid);
|
| - private native void nativeUnselect(long nativeWebContentsAndroid);
|
| + private native void nativeCollapseSelection(long nativeWebContentsAndroid);
|
| private native void nativeOnHide(long nativeWebContentsAndroid);
|
| private native void nativeOnShow(long nativeWebContentsAndroid);
|
| private native void nativeSuspendAllMediaPlayers(long nativeWebContentsAndroid);
|
|
|