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

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

Issue 11568042: Some initial changes for manipulating the top controls positions on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments Created 8 years 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 17449f38e2c9955aa0cfb0b2783f1aabd6b1837b..410b488b17bfba554380abd1be7c6c8267b96849 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 controlsOffsetY, float contentOffsetY) {
+ if (mContentViewClient == null) return;
+ mContentViewClient.onOffsetsForFullscreenChanged(controlsOffsetY, contentOffsetY);
+ }
+
+ @SuppressWarnings("unused")
+ @CalledByNative
private void updatePageScaleLimits(float minimumScale, float maximumScale) {
mNativeMinimumScale = minimumScale;
mNativeMaximumScale = maximumScale;

Powered by Google App Engine
This is Rietveld 408576698