Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2058)

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java

Issue 1239583003: Update touch selection notification names, add ESTABLISHED. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed boolean member to track SELECTION_ESTABLISHED instead of DISSOLVED. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 929e494039c791499ebb359716cf9526ab8b12d8..ceea592129381c2e09b910e6534379714455eac2 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -2197,7 +2197,7 @@ public class ContentViewCore implements
if (left == right) ++right;
if (top == bottom) ++bottom;
switch (eventType) {
- case SelectionEventType.SELECTION_SHOWN:
+ case SelectionEventType.SELECTION_HANDLES_SHOWN:
mSelectionRect.set(left, top, right, bottom);
mHasSelection = true;
mUnselectAllOnActionModeDismiss = true;
@@ -2207,30 +2207,30 @@ public class ContentViewCore implements
showSelectActionMode(true);
break;
- case SelectionEventType.SELECTION_MOVED:
+ case SelectionEventType.SELECTION_HANDLES_MOVED:
mSelectionRect.set(left, top, right, bottom);
invalidateActionModeContentRect();
break;
- case SelectionEventType.SELECTION_CLEARED:
+ case SelectionEventType.SELECTION_HANDLES_CLEARED:
mHasSelection = false;
mUnselectAllOnActionModeDismiss = false;
hideSelectActionMode();
mSelectionRect.setEmpty();
break;
- case SelectionEventType.SELECTION_DRAG_STARTED:
+ case SelectionEventType.SELECTION_HANDLE_DRAG_STARTED:
break;
- case SelectionEventType.SELECTION_DRAG_STOPPED:
+ case SelectionEventType.SELECTION_HANDLE_DRAG_STOPPED:
break;
- case SelectionEventType.INSERTION_SHOWN:
+ case SelectionEventType.INSERTION_HANDLE_SHOWN:
mSelectionRect.set(left, top, right, bottom);
mHasInsertion = true;
break;
- case SelectionEventType.INSERTION_MOVED:
+ case SelectionEventType.INSERTION_HANDLE_MOVED:
mSelectionRect.set(left, top, right, bottom);
if (!isScrollInProgress() && isPastePopupShowing()) {
showPastePopup(xAnchor, yAnchor);
@@ -2239,7 +2239,7 @@ public class ContentViewCore implements
}
break;
- case SelectionEventType.INSERTION_TAPPED:
+ case SelectionEventType.INSERTION_HANDLE_TAPPED:
if (mWasPastePopupShowingOnInsertionDragStart) {
hidePastePopup();
} else {
@@ -2247,18 +2247,20 @@ public class ContentViewCore implements
}
break;
- case SelectionEventType.INSERTION_CLEARED:
+ case SelectionEventType.INSERTION_HANDLE_CLEARED:
hidePastePopup();
mHasInsertion = false;
mSelectionRect.setEmpty();
break;
- case SelectionEventType.INSERTION_DRAG_STARTED:
+ case SelectionEventType.INSERTION_HANDLE_DRAG_STARTED:
mWasPastePopupShowingOnInsertionDragStart = isPastePopupShowing();
hidePastePopup();
break;
- case SelectionEventType.INSERTION_DRAG_STOPPED:
+ case SelectionEventType.INSERTION_HANDLE_DRAG_STOPPED:
+ case SelectionEventType.SELECTION_ESTABLISHED:
+ case SelectionEventType.SELECTION_DISSOLVED:
break;
default:

Powered by Google App Engine
This is Rietveld 408576698