Chromium Code Reviews| 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 6ed81ec447f917fed294221f76467e37aae75225..f9b01ca7496ef80fc873706e8d6dd4f140f0bd7b 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 |
| @@ -377,6 +377,8 @@ import java.util.Map; |
| private Runnable mDeferredHandleFadeInRunnable; |
| + private PositionObserver mPositionObserver; |
| + |
| // Size of the viewport in physical pixels as set from onSizeChanged. |
| private int mViewportWidthPix; |
| private int mViewportHeightPix; |
| @@ -717,6 +719,7 @@ import java.util.Map; |
| mHardwareAccelerated = hasHardwareAcceleration(mContext); |
| mContainerView = containerView; |
| + mPositionObserver = new ViewPositionObserver(mContainerView); |
| int windowNativePointer = windowAndroid != null ? windowAndroid.getNativePointer() : 0; |
| @@ -1999,7 +2002,9 @@ import java.util.Map; |
| private SelectionHandleController getSelectionHandleController() { |
| if (mSelectionHandleController == null) { |
| - mSelectionHandleController = new SelectionHandleController(getContainerView()) { |
| + mSelectionHandleController = new SelectionHandleController( |
| + getContainerView(), |
| + mPositionObserver) { |
|
Ted C
2013/10/14 23:46:44
these params now fit on the same line
|
| @Override |
| public void selectBetweenCoordinates(int x1, int y1, int x2, int y2) { |
| if (mNativeContentViewCore != 0 && !(x1 == x2 && y1 == y2)) { |
| @@ -2025,7 +2030,8 @@ import java.util.Map; |
| private InsertionHandleController getInsertionHandleController() { |
| if (mInsertionHandleController == null) { |
| - mInsertionHandleController = new InsertionHandleController(getContainerView()) { |
| + mInsertionHandleController = new InsertionHandleController( |
| + getContainerView(), mPositionObserver) { |
| private static final int AVERAGE_LINE_HEIGHT = 14; |
| @Override |