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

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 653633005: [WebView] Enable scrolling in fullscreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwViewMethods.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 6d9325aa8c5559c42aaa208389cf6e2c7c48eeaa..a9115ae330af0270667770edd7b531bbd2116d44 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -1288,11 +1288,7 @@ public class AwContents {
* @see View#onScrollChanged(int,int)
*/
public void onContainerViewScrollChanged(int l, int t, int oldl, int oldt) {
- // A side-effect of View.onScrollChanged is that the scroll accessibility event being sent
- // by the base class implementation. This is completely hidden from the base classes and
- // cannot be prevented, which is why we need the code below.
- mScrollAccessibilityHelper.removePostedViewScrolledAccessibilityEventCallback();
- mScrollOffsetManager.onContainerViewScrollChanged(l, t);
+ mAwViewMethods.onContainerViewScrollChanged(l, t, oldl, oldt);
}
/**
@@ -1301,17 +1297,7 @@ public class AwContents {
*/
public void onContainerViewOverScrolled(int scrollX, int scrollY, boolean clampedX,
boolean clampedY) {
- int oldX = mContainerView.getScrollX();
- int oldY = mContainerView.getScrollY();
-
- mScrollOffsetManager.onContainerViewOverScrolled(scrollX, scrollY, clampedX, clampedY);
-
- if (mOverScrollGlow != null) {
- mOverScrollGlow.pullGlow(mContainerView.getScrollX(), mContainerView.getScrollY(),
- oldX, oldY,
- mScrollOffsetManager.computeMaximumHorizontalScrollOffset(),
- mScrollOffsetManager.computeMaximumVerticalScrollOffset());
- }
+ mAwViewMethods.onContainerViewOverScrolled(scrollX, scrollY, clampedX, clampedY);
}
/**
@@ -1324,45 +1310,45 @@ public class AwContents {
}
/**
- * @see View.computeScroll()
- */
- public void computeScroll() {
- mScrollOffsetManager.computeScrollAndAbsorbGlow(mOverScrollGlow);
- }
-
- /**
* @see View#computeHorizontalScrollRange()
*/
public int computeHorizontalScrollRange() {
- return mScrollOffsetManager.computeHorizontalScrollRange();
+ return mAwViewMethods.computeHorizontalScrollRange();
}
/**
* @see View#computeHorizontalScrollOffset()
*/
public int computeHorizontalScrollOffset() {
- return mScrollOffsetManager.computeHorizontalScrollOffset();
+ return mAwViewMethods.computeHorizontalScrollOffset();
}
/**
* @see View#computeVerticalScrollRange()
*/
public int computeVerticalScrollRange() {
- return mScrollOffsetManager.computeVerticalScrollRange();
+ return mAwViewMethods.computeVerticalScrollRange();
}
/**
* @see View#computeVerticalScrollOffset()
*/
public int computeVerticalScrollOffset() {
- return mScrollOffsetManager.computeVerticalScrollOffset();
+ return mAwViewMethods.computeVerticalScrollOffset();
}
/**
* @see View#computeVerticalScrollExtent()
*/
public int computeVerticalScrollExtent() {
- return mScrollOffsetManager.computeVerticalScrollExtent();
+ return mAwViewMethods.computeVerticalScrollExtent();
+ }
+
+ /**
+ * @see View.computeScroll()
+ */
+ public void computeScroll() {
+ mAwViewMethods.computeScroll();
}
/**
@@ -2476,6 +2462,61 @@ public class AwContents {
if (mIsWindowVisible == windowVisible) return;
setWindowVisibilityInternal(windowVisible);
}
+
+ @Override
+ public void onContainerViewScrollChanged(int l, int t, int oldl, int oldt) {
+ // A side-effect of View.onScrollChanged is that the scroll accessibility event being
+ // sent by the base class implementation. This is completely hidden from the base
+ // classes and cannot be prevented, which is why we need the code below.
+ mScrollAccessibilityHelper.removePostedViewScrolledAccessibilityEventCallback();
+ mScrollOffsetManager.onContainerViewScrollChanged(l, t);
+ }
+
+ @Override
+ public void onContainerViewOverScrolled(int scrollX, int scrollY, boolean clampedX,
+ boolean clampedY) {
+ int oldX = mContainerView.getScrollX();
+ int oldY = mContainerView.getScrollY();
+
+ mScrollOffsetManager.onContainerViewOverScrolled(scrollX, scrollY, clampedX, clampedY);
+
+ if (mOverScrollGlow != null) {
+ mOverScrollGlow.pullGlow(mContainerView.getScrollX(), mContainerView.getScrollY(),
+ oldX, oldY,
+ mScrollOffsetManager.computeMaximumHorizontalScrollOffset(),
+ mScrollOffsetManager.computeMaximumVerticalScrollOffset());
+ }
+ }
+
+ @Override
+ public int computeHorizontalScrollRange() {
+ return mScrollOffsetManager.computeHorizontalScrollRange();
+ }
+
+ @Override
+ public int computeHorizontalScrollOffset() {
+ return mScrollOffsetManager.computeHorizontalScrollOffset();
+ }
+
+ @Override
+ public int computeVerticalScrollRange() {
+ return mScrollOffsetManager.computeVerticalScrollRange();
+ }
+
+ @Override
+ public int computeVerticalScrollOffset() {
+ return mScrollOffsetManager.computeVerticalScrollOffset();
+ }
+
+ @Override
+ public int computeVerticalScrollExtent() {
+ return mScrollOffsetManager.computeVerticalScrollExtent();
+ }
+
+ @Override
+ public void computeScroll() {
+ mScrollOffsetManager.computeScrollAndAbsorbGlow(mOverScrollGlow);
+ }
}
// Return true if the GeolocationPermissionAPI should be used.
« no previous file with comments | « no previous file | android_webview/java/src/org/chromium/android_webview/AwViewMethods.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698