android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java - Issue 1251323002: Plumb smooth scrolling in Chromium compositor

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java

Issue 1251323002: Plumb smooth scrolling in Chromium compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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 | « android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java ('k') | android_webview/native/aw_contents.h » ('j') | content/renderer/input/input_handler_proxy.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwScrollOffsetManagerTest.java

index 525c4f6e89460de24f44223ce3a8bd1125b6070f..19ab7d21639d6d7628885fc093d66ce07ab3cdf8 100644

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

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

@@ -8,7 +8,6 @@ import android.graphics.Rect;

import android.os.Build;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.SmallTest;

-import android.widget.OverScroller;

import org.chromium.android_webview.AwScrollOffsetManager;

import org.chromium.base.test.util.Feature;

@@ -99,6 +98,10 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Override

public void cancelFling() {

}

+ @Override

+ public void smoothScroll(

+ long currentMs, int scrollX, int scrollY, int dx, int dy, long durationMs) {}

}

private void simulateScrolling(AwScrollOffsetManager offsetManager,

@@ -127,8 +130,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testWhenContentSizeMatchesView() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int width = 132;

final int height = 212;

@@ -180,8 +182,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testScrollRangeAndMaxOffset() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);

offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);

@@ -238,8 +239,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

return overrideScrollY;

}

};

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);

offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);

@@ -265,8 +265,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

return overrideScrollY;

}

};

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);

offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);

@@ -280,8 +279,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testScrollContainerViewTo() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int scrollX = 31;

final int scrollY = 41;

@@ -303,8 +301,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testOnContainerViewOverScrolled() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int scrollX = 31;

final int scrollY = 41;

@@ -328,8 +325,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testDefersScrollUntilTouchEnd() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int scrollX = 31;

final int scrollY = 41;

@@ -355,8 +351,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testRequestChildRectangleOnScreenDontScrollIfAlreadyThere() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

offsetManager.setMaxScrollOffset(MAX_HORIZONTAL_OFFSET, MAX_VERTICAL_OFFSET);

offsetManager.setContainerViewSize(VIEW_WIDTH, VIEW_HEIGHT);

@@ -380,8 +375,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testRequestChildRectangleOnScreenScrollToBottom() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int rectWidth = 2;

final int rectHeight = 3;

@@ -402,8 +396,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testRequestChildRectangleOnScreenScrollToBottomLargeRect() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int rectWidth = VIEW_WIDTH;

final int rectHeight = VIEW_HEIGHT;

@@ -424,8 +417,7 @@ public class AwScrollOffsetManagerTest extends InstrumentationTestCase {

@Feature({"AndroidWebView"})

public void testRequestChildRectangleOnScreenScrollToTop() {

TestScrollOffsetManagerDelegate delegate = new TestScrollOffsetManagerDelegate();

- OverScroller scroller = new OverScroller(getInstrumentation().getContext());

- AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate, scroller);

+ AwScrollOffsetManager offsetManager = new AwScrollOffsetManager(delegate);

final int rectWidth = 2;

final int rectHeight = 3;