Merge 218265 "[android_webview] Implement requestChildRectangleO..."

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.view.View;
-import android.view.View.MeasureSpec;
-import android.widget.OverScroller;
+import android.graphics.Rect;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.view.View.MeasureSpec;
+import android.view.View;
+import android.widget.OverScroller;
 
 import org.chromium.android_webview.AwScrollOffsetManager;
 import org.chromium.base.test.util.Feature;
 
 public class AwScrollOffsetManagerTest extends InstrumentationTestCase {
     private static class TestScrollOffsetManagerDelegate implements AwScrollOffsetManager.Delegate {
         private int mOverScrollDeltaX;
         private int mOverScrollDeltaY;
         private int mOverScrollCallCount;
         private int mScrollX;
@@ skipping 76 matching lines @@
         int callCount = delegate.getOverScrollCallCount();
         offsetManager.scrollContainerViewTo(scrollX, scrollY);
         // The manager then asks the delegate to overscroll the view.
         assertEquals(callCount + 1, delegate.getOverScrollCallCount());
         assertEquals(scrollX, delegate.getOverScrollDeltaX() + delegate.getScrollX());
         assertEquals(scrollY, delegate.getOverScrollDeltaY() + delegate.getScrollY());
         // As a response to that the menager expects the view to call back with the new scroll.
         offsetManager.onContainerViewOverScrolled(scrollX, scrollY, false, false);
     }
 
+    private void simlateOverScrollPropagation(AwScrollOffsetManager offsetManager,
+            TestScrollOffsetManagerDelegate delegate) {
+        assertTrue(delegate.getOverScrollCallCount() > 0);
+
+        offsetManager.onContainerViewOverScrolled(
+                delegate.getOverScrollDeltaX() + delegate.getScrollX(),
+                delegate.getOverScrollDeltaY() + delegate.getScrollY(), false, false);
+    }
+
     @SmallTest
     @Feature({"AndroidWebView"})
     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;
@@ skipping 28 matching lines @@
         assertEquals(-scrollX, delegate.getOverScrollDeltaX());
         assertEquals(-scrollY, delegate.getOverScrollDeltaY());
         assertEquals(0, delegate.getScrollX());
         assertEquals(0, delegate.getScrollY());
         assertEquals(0, delegate.getNativeScrollX());
         assertEquals(0, delegate.getNativeScrollY());
     }
 
     private static final int VIEW_WIDTH = 211;
     private static final int VIEW_HEIGHT = 312;
-    private static final int MAX_HORIZONTAL_OFFSET = 61;
-    private static final int MAX_VERTICAL_OFFSET = 42;
+    private static final int MAX_HORIZONTAL_OFFSET = 757;
+    private static final int MAX_VERTICAL_OFFSET = 127;
     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);
 
@@ skipping 59 matching lines @@
         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 = 222;
-        final int overrideScrollY = 333;
+        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;
             }
@@ skipping 94 matching lines @@
         offsetManager.flingScroll(0, 101);
         assertTrue(!scroller.isFinished());
         assertTrue(delegate.getInvalidateCount() == 1);
         assertEquals(101, (int) scroller.getCurrVelocity());
 
         offsetManager.flingScroll(111, 0);
         assertTrue(!scroller.isFinished());
         assertTrue(delegate.getInvalidateCount() == 2);
         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.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.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.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.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());
+    }
 }