content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java - Issue 2770613002: Forward GenericMotionEvent to EventForwarder

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

Issue 2770613002: Forward GenericMotionEvent to EventForwarder (Closed)

Patch Set: comments Created 3 years, 9 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

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/input/JoystickZoomProvider.java ('k') | ui/android/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java

index d6a824d5d3cc9d97654a1c1a726a1040b6a43167..bf4d2d9839e0562b5872b3f1fe5579a878600a30 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewZoomingTest.java

@@ -17,7 +17,6 @@ import org.junit.runner.RunWith;

import org.chromium.base.test.BaseJUnit4ClassRunner;

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

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

-import org.chromium.content.browser.input.AnimationIntervalProvider;

import org.chromium.content.browser.input.JoystickZoomProvider;

import org.chromium.content_shell_apk.ContentShellActivityTestRule;

@@ -36,7 +35,8 @@ public class ContentViewZoomingTest {

+ "<body>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</body>"

+ "</html>");

- private static class TestAnimationIntervalProvider implements AnimationIntervalProvider {

+ private static class TestAnimationIntervalProvider

+ implements JoystickZoomProvider.AnimationIntervalProvider {

private long mAnimationTime;

@Override

public long getLastAnimationFrameInterval() {

@@ -47,8 +47,9 @@ public class ContentViewZoomingTest {

private class TestJoystickZoomProvider extends JoystickZoomProvider {

TestJoystickZoomProvider(ContentViewCore cvc, AnimationIntervalProvider intervalProvider) {

- super(cvc, intervalProvider);

- mDeviceScaleFactor = 2.0f;

+ super(cvc.getContainerView(), 2.0f, cvc.getViewportWidthPix() / 2,

+ cvc.getViewportHeightPix() / 2, cvc);

+ setAnimationIntervalProviderForTesting(intervalProvider);

mZoomRunnable = new Runnable() {

@Override

@@ -99,9 +100,8 @@ public class ContentViewZoomingTest {

@Feature({"JoystickZoom"})

public void testJoystickZoomIn() throws Throwable {

MotionEvent rTriggerEvent;

- AnimationIntervalProvider intervalProvider = new TestAnimationIntervalProvider();

TestJoystickZoomProvider rtJoystickZoomProvider = new TestJoystickZoomProvider(

- mActivityTestRule.getContentViewCore(), intervalProvider);

+ mActivityTestRule.getContentViewCore(), new TestAnimationIntervalProvider());

// Verify page does not zoom-in if trigger motion falls in deadzone.

rTriggerEvent = simulateJoystickEvent(0.1f, true);

rtJoystickZoomProvider.animateZoomTest(rTriggerEvent, 20);

@@ -125,9 +125,8 @@ public class ContentViewZoomingTest {

@Feature({"JoystickZoom"})

public void testJoystickZoomOut() throws Throwable {

MotionEvent lTriggerEvent;

- AnimationIntervalProvider intervalProvider = new TestAnimationIntervalProvider();

TestJoystickZoomProvider ltJoystickZoomProvider = new TestJoystickZoomProvider(

- mActivityTestRule.getContentViewCore(), intervalProvider);

+ mActivityTestRule.getContentViewCore(), new TestAnimationIntervalProvider());

// Zoom page to max size.

lTriggerEvent = simulateJoystickEvent(1.0f, true);

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/input/JoystickZoomProvider.java ('k') | ui/android/DEPS » ('j') | no next file with comments »