Make Paste Popup use selection rect for positioning

content/public/android/java/src/org/chromium/content/browser/SelectionPopupController.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.ClipData;
@@ skipping 75 matching lines @@
     // of adding and removing it once we switch to Android O SDK. The show/hide method
     // does not require ordering information.
     private static final int MENU_ITEM_ORDER_TEXT_PROCESS_START = 100;
 
     private final Context mContext;
     private final WindowAndroid mWindowAndroid;
     private final WebContents mWebContents;
     private final RenderCoordinates mRenderCoordinates;
     private ActionMode.Callback mCallback;
 
     // Selection rectangle in DIP.

[boliu, 2017/05/04 20:36:11]

no longer in DIP? also it has the Y offset thing

[amaralp, 2017/05/05 01:14:32]

Reverted to it being in DIP

     private final Rect mSelectionRect = new Rect();
 
     // Self-repeating task that repeatedly hides the ActionMode. This is
     // required because ActionMode only exposes a temporary hide routine.
     private final Runnable mRepeatingHideRunnable;
 
     private View mView;
     private ActionMode mActionMode;
     private MenuDescriptor mActionMenuDescriptor;
 
@@ skipping 154 matching lines @@
         if (!isActionModeValid()) clearSelection();
     }
 
     @TargetApi(Build.VERSION_CODES.M)
     private ActionMode startFloatingActionMode() {
         ActionMode actionMode = mView.startActionMode(
                 new FloatingActionModeCallback(this, mCallback), ActionMode.TYPE_FLOATING);
         return actionMode;
     }
 
-    void createAndShowPastePopup(int x, int y, boolean canSelectAll, boolean canEditRichly) {
+    void createAndShowPastePopup(
+            int left, int top, int right, int bottom, boolean canSelectAll, boolean canEditRichly) {
         if (mView.getParent() == null || mView.getVisibility() != View.VISIBLE) {
             return;
         }
 
         if (!supportsFloatingActionMode() && !canPaste()) return;
         destroyPastePopup();
+        setSelectionRect(left, top, right, bottom);
         mCanSelectAllForPastePopup = canSelectAll;
         mCanEditRichlyForPastePopup = canEditRichly;
         PastePopupMenuDelegate delegate = new PastePopupMenuDelegate() {
             @Override
             public void paste() {
                 mWebContents.paste();
                 mWebContents.dismissTextHandles();
             }
 
             @Override
@@ skipping 22 matching lines @@
                 return SelectionPopupController.this.canPasteAsPlainText();
             }
         };
         Context windowContext = mWindowAndroid.getContext().get();
         if (windowContext == null) return;
         if (supportsFloatingActionMode()) {
             mPastePopupMenu = new FloatingPastePopupMenu(windowContext, mView, delegate);
         } else {
             mPastePopupMenu = new LegacyPastePopupMenu(windowContext, mView, delegate);
         }
-        showPastePopup(x, y);
+        showPastePopup();
     }
 
-    private void showPastePopup(int x, int y) {
-        // Coordinates are in DIP.
-        final float deviceScale = mRenderCoordinates.getDeviceScaleFactor();
-        final int xPix = (int) (x * deviceScale);
-        final int yPix = (int) (y * deviceScale);
-        final float browserControlsShownPix = mRenderCoordinates.getContentOffsetYPix();
+    private void showPastePopup() {
         try {
-            mPastePopupMenu.show(xPix, (int) (yPix + browserControlsShownPix));
+            mPastePopupMenu.show(mSelectionRect);
         } catch (WindowManager.BadTokenException e) {
         }
     }
 
     @Override
     public boolean supportsFloatingActionMode() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M;
     }
 
     void destroyPastePopup() {
@@ skipping 330 matching lines @@
      * Called when an ActionMode needs to be positioned on screen, potentially occluding view
      * content. Note this may be called on a per-frame basis.
      *
      * @param mode The ActionMode that requires positioning.
      * @param view The View that originated the ActionMode, in whose coordinates the Rect should
      *             be provided.
      * @param outRect The Rect to be populated with the content position.
      */
     @Override
     public void onGetContentRect(ActionMode mode, View view, Rect outRect) {
+        outRect.set(mSelectionRect);
+    }
+
+    private void setSelectionRect(int left, int top, int right, int bottom) {
         float deviceScale = mRenderCoordinates.getDeviceScaleFactor();
-        outRect.set((int) (mSelectionRect.left * deviceScale),
-                (int) (mSelectionRect.top * deviceScale),
-                (int) (mSelectionRect.right * deviceScale),
-                (int) (mSelectionRect.bottom * deviceScale));
-
+        mSelectionRect.set((int) (left * deviceScale), (int) (top * deviceScale),
+                (int) (right * deviceScale), (int) (bottom * deviceScale));
         // The selection coordinates are relative to the content viewport, but we need
         // coordinates relative to the containing View.
-        outRect.offset(0, (int) mRenderCoordinates.getContentOffsetYPix());
+        mSelectionRect.offset(0, (int) mRenderCoordinates.getContentOffsetYPix());
     }
 
     /**
      * Perform an action that depends on the semantics of the selected text.
      */
     @VisibleForTesting
     void doAssistAction() {
         if (mClassificationResult == null || !mClassificationResult.hasNamedAction()) return;
 
         assert mClassificationResult.onClickListener != null
@@ skipping 209 matching lines @@
     }
 
     void restoreSelectionPopupsIfNecessary() {
         if (mHasSelection && !isActionModeValid()) {
             showActionModeOrClearOnFailure();
         }
     }
 
     // All coordinates are in DIP.
     @CalledByNative
-    private void onSelectionEvent(
-            int eventType, int xAnchor, int yAnchor, int left, int top, int right, int bottom) {
+    private void onSelectionEvent(int eventType, int left, int top, int right, int bottom) {
         // Ensure the provided selection coordinates form a non-empty rect, as required by
         // the selection action mode.
         if (left == right) ++right;
         if (top == bottom) ++bottom;
         switch (eventType) {
             case SelectionEventType.SELECTION_HANDLES_SHOWN:
-                mSelectionRect.set(left, top, right, bottom);
+                setSelectionRect(left, top, right, bottom);
                 mHasSelection = true;
                 mUnselectAllOnDismiss = true;
                 if (mSelectionClient == null || !mSelectionClient.sendsSelectionPopupUpdates()) {
                     showActionModeOrClearOnFailure();
                 } else {
                     // Rely on |mSelectionClient| sending a classification request and the request
                     // always calling onClassified() callback.
                     mPendingShowActionMode = true;
                 }
                 break;
 
             case SelectionEventType.SELECTION_HANDLES_MOVED:
-                mSelectionRect.set(left, top, right, bottom);
+                setSelectionRect(left, top, right, bottom);
                 if (mPendingShowActionMode) {
                     showActionModeOrClearOnFailure();
                 } else {
                     invalidateContentRect();
                 }
                 break;
 
             case SelectionEventType.SELECTION_HANDLES_CLEARED:
                 mHasSelection = false;
                 mUnselectAllOnDismiss = false;
                 mSelectionRect.setEmpty();
                 finishActionMode();
                 break;
 
             case SelectionEventType.SELECTION_HANDLE_DRAG_STARTED:
                 hideActionMode(true);
                 break;
 
             case SelectionEventType.SELECTION_HANDLE_DRAG_STOPPED:
                 if (mSelectionClient == null || !mSelectionClient.sendsSelectionPopupUpdates()) {
                     hideActionMode(false);
                 }
                 // Otherwise rely on |mSelectionClient| sending a classification request and the
                 // request always calling onClassified() callback.
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_SHOWN:
-                mSelectionRect.set(left, top, right, bottom);
+                setSelectionRect(left, top, right, bottom);
                 mIsInsertion = true;
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_MOVED:
-                mSelectionRect.set(left, top, right, bottom);
+                setSelectionRect(left, top, right, bottom);
                 if (!mScrollInProgress && isPastePopupShowing()) {
-                    showPastePopup(xAnchor, yAnchor);
+                    showPastePopup();
                 } else {
                     destroyPastePopup();
                 }
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_TAPPED:
                 if (mWasPastePopupShowingOnInsertionDragStart) {
                     destroyPastePopup();
                 } else {
-                    mWebContents.showContextMenuAtPoint(xAnchor, yAnchor);
+                    mWebContents.showContextMenuAtPoint(
+                            mSelectionRect.centerX(), mSelectionRect.centerY());

[boliu, 2017/05/04 20:36:11]

from the xAnchorPix computation below, seems like this used to be the bottom
left, now everything is centered. also this is in physical pixel rather than css
pixels.

ditto below

[amaralp, 2017/05/05 01:14:32]

Changed it back to bottom left and css pixel

                 }
                 mWasPastePopupShowingOnInsertionDragStart = false;
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_CLEARED:
                 destroyPastePopup();
                 mIsInsertion = false;
                 mSelectionRect.setEmpty();
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_DRAG_STARTED:
                 mWasPastePopupShowingOnInsertionDragStart = isPastePopupShowing();
                 destroyPastePopup();
                 break;
 
             case SelectionEventType.INSERTION_HANDLE_DRAG_STOPPED:
                 if (mWasPastePopupShowingOnInsertionDragStart) {
-                    mWebContents.showContextMenuAtPoint(xAnchor, yAnchor);
+                    mWebContents.showContextMenuAtPoint(
+                            mSelectionRect.centerX(), mSelectionRect.centerY());
                 }
                 mWasPastePopupShowingOnInsertionDragStart = false;
                 break;
 
             default:
                 assert false : "Invalid selection event type.";
         }
 
         if (mSelectionClient != null) {
             final float deviceScale = mRenderCoordinates.getDeviceScaleFactor();
-            int xAnchorPix = (int) (xAnchor * deviceScale);
-            int yAnchorPix = (int) (yAnchor * deviceScale);
+            int xAnchorPix = (int) (mSelectionRect.left * deviceScale);

[boliu, 2017/05/04 20:36:11]

isn't mSelectionRect already multiplied by scale?

[amaralp, 2017/05/05 01:14:32]

Yeah, made it not be multiplied by scale.

+            int yAnchorPix = (int) (mSelectionRect.bottom * deviceScale);
             mSelectionClient.onSelectionEvent(eventType, xAnchorPix, yAnchorPix);
         }
     }
 
     /**
      * Clears the current text selection. Note that we will try to move cursor to selection
      * end if applicable.
      */
     void clearSelection() {
         if (mWebContents == null || !isActionModeSupported()) return;
@@ skipping 108 matching lines @@
                 if (mPendingShowActionMode) return;
             }
 
             // Rely on this method to clear |mHidden| and unhide the action mode.
             showActionModeOrClearOnFailure();
         }
     };
 
     private native void nativeInit(WebContents webContents);
 }