[android_webview] Use a fraction to calculate scroll offset.

android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java

 // Copyright 2013 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.android_webview.test;
 
 import android.content.Context;
 import android.graphics.Rect;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
@@ skipping 110 matching lines @@
     public void testWhenContentSizeMatchesView() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int width = 132;
         final int height = 212;
         final int scrollX = 11;
         final int scrollY = 13;
 
-        offsetManager.setContentSize(width, height);
+        offsetManager.setMaxScrollOffset(0, 0);
         offsetManager.setContainerViewSize(width, height);
 
         assertEquals(width, offsetManager.computeHorizontalScrollRange());
         assertEquals(height, offsetManager.computeVerticalScrollRange());
 
         // Since the view size and contents size are equal no scrolling should be possible.
         assertEquals(0, offsetManager.computeMaximumHorizontalScrollOffset());
         assertEquals(0, offsetManager.computeMaximumVerticalScrollOffset());
 
         // Scrolling should generate overscroll but not update the scroll offset.
@@ skipping 27 matching lines @@
     private static final int CONTENT_WIDTH = VIEW_WIDTH + MAX_HORIZONTAL_OFFSET;
     private static final int CONTENT_HEIGHT = VIEW_HEIGHT + MAX_VERTICAL_OFFSET;
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testScrollRangeAndMaxOffset() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         assertEquals(CONTENT_WIDTH, offsetManager.computeHorizontalScrollRange());
         assertEquals(CONTENT_HEIGHT, offsetManager.computeVerticalScrollRange());
 
         assertEquals(MAX_HORIZONTAL_OFFSET, offsetManager.computeMaximumHorizontalScrollOffset());
         assertEquals(MAX_VERTICAL_OFFSET, offsetManager.computeMaximumVerticalScrollOffset());
 
         // Scrolling beyond the maximum should be clamped.
         final int scrollX = MAX_HORIZONTAL_OFFSET + 10;
@@ skipping 17 matching lines @@
         // The onScrollChanged method is callable by third party code and should also be clamped
         offsetManager.onContainerViewScrollChanged(scrollX, scrollY);
         assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getNativeScrollX());
         assertEquals(MAX_VERTICAL_OFFSET, delegate.getNativeScrollY());
 
         offsetManager.onContainerViewScrollChanged(-scrollX, -scrollY);
         assertEquals(0, delegate.getNativeScrollX());
         assertEquals(0, delegate.getNativeScrollY());
     }
 
-
-    @SmallTest
-    @Feature({"AndroidWebView"})
-    public void testScrollDeferredOnInvalidContentSize() {
-        TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
-        OverScroller scroller = new OverScroller(getInstrumentation().getContext());
-        AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
-
-        offsetManager.setContentSize(0, 0);
-        offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
-
-        final int firstScrollX = MAX_HORIZONTAL_OFFSET + 10;
-        final int firstScrollY = MAX_VERTICAL_OFFSET + 11;
-        int expectedCallCount = delegate.getOverScrollCallCount();
-        offsetManager.scrollContainerViewTo(firstScrollX, firstScrollY);
-        assertEquals(expectedCallCount, delegate.getOverScrollCallCount());
-        assertEquals(0, delegate.getOverScrollDeltaX() + delegate.getScrollX());
-        assertEquals(0, delegate.getOverScrollDeltaY() + delegate.getScrollY());
-
-        // Repeated scrolls will also be deferred, overwriting any previous deferred scroll offset.
-        final int secondScrollX = MAX_HORIZONTAL_OFFSET;
-        final int secondScrollY = MAX_VERTICAL_OFFSET;
-        offsetManager.scrollContainerViewTo(secondScrollX, secondScrollY);
-        assertEquals(expectedCallCount, delegate.getOverScrollCallCount());
-        assertEquals(0, delegate.getOverScrollDeltaX() + delegate.getScrollX());
-        assertEquals(0, delegate.getOverScrollDeltaY() + delegate.getScrollY());
-
-        // Setting a valid size will release the deferred container scroll offset.
-        expectedCallCount++;
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
-        assertEquals(expectedCallCount, delegate.getOverScrollCallCount());
-        assertEquals(secondScrollX, delegate.getOverScrollDeltaX() + delegate.getScrollX());
-        assertEquals(secondScrollY, delegate.getOverScrollDeltaY() + delegate.getScrollY());
-        offsetManager.onContainerViewOverScrolled(secondScrollX, secondScrollY, false, false);
-
-        assertEquals(secondScrollX, delegate.getOverScrollDeltaX());
-        assertEquals(secondScrollY, delegate.getOverScrollDeltaY());
-        assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getScrollX());
-        assertEquals(MAX_VERTICAL_OFFSET, delegate.getScrollY());
-
-        // Subsequently setting valid content sizes should not release another scroll update.
-        offsetManager.setContentSize(CONTENT_WIDTH + 10, CONTENT_HEIGHT + 10);
-        assertEquals(expectedCallCount, delegate.getOverScrollCallCount());
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
-        assertEquals(expectedCallCount, delegate.getOverScrollCallCount());
-    }
-
-
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testDelegateCanOverrideScroll() {
         final int overrideScrollX = 10;
         final int overrideScrollY = 10;
 
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate() {
             @Override
             public int getContainerViewScrollX() {
                 return overrideScrollX;
             }
 
             @Override
             public int getContainerViewScrollY() {
                 return overrideScrollY;
             }
         };
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         offsetManager.onContainerViewOverScrolled(0, 0, false, false);
         assertEquals(overrideScrollX, delegate.getNativeScrollX());
         assertEquals(overrideScrollY, delegate.getNativeScrollY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testDelegateOverridenScrollsDontExceedBounds() {
         final int overrideScrollX = MAX_HORIZONTAL_OFFSET + 10;
         final int overrideScrollY = MAX_VERTICAL_OFFSET + 20;
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate() {
             @Override
             public int getContainerViewScrollX() {
                 return overrideScrollX;
             }
 
             @Override
             public int getContainerViewScrollY() {
                 return overrideScrollY;
             }
         };
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         offsetManager.onContainerViewOverScrolled(0, 0, false, false);
         assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getNativeScrollX());
         assertEquals(MAX_VERTICAL_OFFSET, delegate.getNativeScrollY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testScrollContainerViewTo() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int scrollX = 31;
         final int scrollY = 41;
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         assertEquals(0, delegate.getOverScrollDeltaX());
         assertEquals(0, delegate.getOverScrollDeltaY());
         int callCount = delegate.getOverScrollCallCount();
 
         offsetManager.scrollContainerViewTo(scrollX, scrollY);
         assertEquals(callCount + 1, delegate.getOverScrollCallCount());
         assertEquals(scrollX, delegate.getOverScrollDeltaX());
         assertEquals(scrollY, delegate.getOverScrollDeltaY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testOnContainerViewOverScrolled() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int scrollX = 31;
         final int scrollY = 41;
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         assertEquals(0, delegate.getScrollX());
         assertEquals(0, delegate.getScrollY());
         assertEquals(0, delegate.getNativeScrollX());
         assertEquals(0, delegate.getNativeScrollY());
 
         offsetManager.onContainerViewOverScrolled(scrollX, scrollY, false, false);
         assertEquals(scrollX, delegate.getScrollX());
         assertEquals(scrollY, delegate.getScrollY());
         assertEquals(scrollX, delegate.getNativeScrollX());
         assertEquals(scrollY, delegate.getNativeScrollY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testDefersScrollUntilTouchEnd() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int scrollX = 31;
         final int scrollY = 41;
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         offsetManager.setProcessingTouchEvent(true);
         offsetManager.onContainerViewOverScrolled(scrollX, scrollY, false, false);
         assertEquals(scrollX, delegate.getScrollX());
         assertEquals(scrollY, delegate.getScrollY());
         assertEquals(0, delegate.getNativeScrollX());
         assertEquals(0, delegate.getNativeScrollY());
 
         offsetManager.setProcessingTouchEvent(false);
@@ skipping 21 matching lines @@
         assertEquals(111, (int) scroller.getCurrVelocity());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testRequestChildRectangleOnScreenDontScrollIfAlreadyThere() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         offsetManager.requestChildRectangleOnScreen(0, 0,
                 new Rect(0, 0, VIEW_WIDTH / 4, VIEW_HEIGHT / 4), true);
         assertEquals(0, delegate.getOverScrollDeltaX());
         assertEquals(0, delegate.getOverScrollDeltaY());
         assertEquals(0, delegate.getScrollX());
         assertEquals(0, delegate.getScrollY());
 
         offsetManager.requestChildRectangleOnScreen(3 * VIEW_WIDTH / 4, 3 * VIEW_HEIGHT / 4,
                 new Rect(0, 0, VIEW_WIDTH / 4, VIEW_HEIGHT / 4), true);
         assertEquals(0, delegate.getOverScrollDeltaX());
         assertEquals(0, delegate.getOverScrollDeltaY());
         assertEquals(0, delegate.getScrollX());
         assertEquals(0, delegate.getScrollY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testRequestChildRectangleOnScreenScrollToBottom() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int rectWidth = 2;
         final int rectHeight = 3;
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         offsetManager.requestChildRectangleOnScreen(CONTENT_WIDTH - rectWidth,
                 CONTENT_HEIGHT - rectHeight, new Rect(0, 0, rectWidth, rectHeight), true);
         simlateOverScrollPropagation(offsetManager, delegate);
         assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getOverScrollDeltaX());
         assertEquals(CONTENT_HEIGHT - rectHeight - VIEW_HEIGHT / 3, delegate.getOverScrollDeltaY());
         assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getScrollX());
         assertEquals(MAX_VERTICAL_OFFSET, delegate.getScrollY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testRequestChildRectangleOnScreenScrollToBottomLargeRect() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int rectWidth = VIEW_WIDTH;
         final int rectHeight = VIEW_HEIGHT;
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
 
         offsetManager.requestChildRectangleOnScreen(CONTENT_WIDTH - rectWidth,
                 CONTENT_HEIGHT - rectHeight, new Rect(0, 0, rectWidth, rectHeight), true);
         simlateOverScrollPropagation(offsetManager, delegate);
         assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getOverScrollDeltaX());
         assertEquals(MAX_VERTICAL_OFFSET, delegate.getOverScrollDeltaY());
         assertEquals(MAX_HORIZONTAL_OFFSET, delegate.getScrollX());
         assertEquals(MAX_VERTICAL_OFFSET, delegate.getScrollY());
     }
 
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testRequestChildRectangleOnScreenScrollToTop() {
         TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();
         OverScroller scroller = new OverScroller(getInstrumentation().getContext());
         AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);
 
         final int rectWidth = 2;
         final int rectHeight = 3;
 
-        offsetManager.setContentSize(CONTENT_WIDTH, CONTENT_HEIGHT);
+        offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);
         offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);
         simulateScrolling(offsetManager, delegate,
                 CONTENT_WIDTH - VIEW_WIDTH, CONTENT_HEIGHT - VIEW_HEIGHT);
 
         offsetManager.requestChildRectangleOnScreen(0, 0,
                 new Rect(0, 0, rectWidth, rectHeight), true);
         simlateOverScrollPropagation(offsetManager, delegate);
         assertEquals(-CONTENT_WIDTH + VIEW_WIDTH, delegate.getOverScrollDeltaX());
         assertEquals(-CONTENT_HEIGHT + VIEW_HEIGHT, delegate.getOverScrollDeltaY());
         assertEquals(0, delegate.getScrollX());
         assertEquals(0, delegate.getScrollX());
     }
 }