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 17449f38e2c9955aa0cfb0b2783f1aabd6b1837b..63bbd98df69bb0cc40c50a6633fcf1154d92ea13 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 |
@@ -1657,11 +1657,11 @@ public class ContentViewCore implements MotionEventDelegate { |
public void showHandlesAt(int x1, int y1, int dir1, int x2, int y2, int dir2) { |
super.showHandlesAt(x1, y1, dir1, x2, y2, dir2); |
mStartHandleNormalizedPoint.set( |
- (x1 + mNativeScrollX) / mNativePageScaleFactor, |
- (y1 + mNativeScrollY) / mNativePageScaleFactor); |
+ (x1 + mNativeScrollX) / mNativePageScaleFactor, |
+ (y1 + mNativeScrollY) / mNativePageScaleFactor); |
mEndHandleNormalizedPoint.set( |
- (x2 + mNativeScrollX) / mNativePageScaleFactor, |
- (y2 + mNativeScrollY) / mNativePageScaleFactor); |
+ (x2 + mNativeScrollX) / mNativePageScaleFactor, |
+ (y2 + mNativeScrollY) / mNativePageScaleFactor); |
showSelectActionBar(); |
} |
@@ -1701,8 +1701,8 @@ public class ContentViewCore implements MotionEventDelegate { |
public void showHandleAt(int x, int y) { |
super.showHandleAt(x, y); |
mInsertionHandleNormalizedPoint.set( |
- (x + mNativeScrollX) / mNativePageScaleFactor, |
- (y + mNativeScrollY) / mNativePageScaleFactor); |
+ (x + mNativeScrollX) / mNativePageScaleFactor, |
+ (y + mNativeScrollY) / mNativePageScaleFactor); |
} |
}; |
@@ -1868,6 +1868,13 @@ public class ContentViewCore implements MotionEventDelegate { |
@SuppressWarnings("unused") |
@CalledByNative |
+ private void updateOffsetsForFullscreen(float controlsOffset, float contentOffset) { |
David Trainor- moved to gerrit
2012/12/17 18:31:32
controlsOffsetY/contentOffsetY imo
Ted C
2012/12/17 18:39:48
Done.
|
+ if (mContentViewClient == null) return; |
+ mContentViewClient.onOffsetsForFullscreenChanged(controlsOffset, contentOffset); |
+ } |
+ |
+ @SuppressWarnings("unused") |
+ @CalledByNative |
private void updatePageScaleLimits(float minimumScale, float maximumScale) { |
mNativeMinimumScale = minimumScale; |
mNativeMaximumScale = maximumScale; |