Hookup android_webview scroll offset delegation to Java side.

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..df459b442cdc464774e8c51fcc82155eb8a6fb96
--- /dev/null
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
@@ -0,0 +1,260 @@
+// 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.test.suitebuilder.annotation.SmallTest;
+import android.util.Log;
+import android.view.View;
+
+import org.chromium.android_webview.AwContents;
+import org.chromium.android_webview.AwContentsClient;
+import org.chromium.android_webview.test.util.CommonResources;
+import org.chromium.android_webview.test.util.JavascriptEventObserver;
+import org.chromium.base.test.util.Feature;
+import org.chromium.content.browser.ContentViewCore;
+import org.chromium.content.browser.test.util.CallbackHelper;
+import org.chromium.content.browser.test.util.CallbackHelper;
+import org.chromium.content.browser.test.util.TestTouchUtils;
+import org.chromium.ui.gfx.DeviceDisplayInfo;
+
+/**
+ * Integration tests for synchronous scrolling.
+ */
+public class AndroidScrollIntegrationTest extends AwTestBase {
+
+    public final int SCROLL_OFFSET_PROPAGATION_TIMEOUT_MS = 5 * 1000;
+
+    private class ScrollTestContainerView extends AwTestContainerView {
+        private int mMaxScrollXPix = -1;
+        private int mMaxScrollYPix = -1;
+        private CallbackHelper mOnScrollToCallbackHelper = new CallbackHelper();
+
+        public ScrollTestContainerView(Context context) {
+            super(context);
+        }
+
+        public CallbackHelper getOnScrollToCallbackHelper() {
+            return mOnScrollToCallbackHelper;
+        }
+
+        public void setMaxScrollX(int maxScrollXPix) {
+            mMaxScrollXPix = maxScrollXPix;
+        }
+
+        public void setMaxScrollY(int maxScrollYPix) {
+            mMaxScrollYPix = maxScrollYPix;
+        }
+
+        @Override
+        public void scrollTo(int x, int y) {
+            if (mMaxScrollXPix != -1)
+                x = Math.min(mMaxScrollXPix, x);
+            if (mMaxScrollYPix != -1)
+                y = Math.min(mMaxScrollYPix, y);
+            super.scrollTo(x, y);
+            mOnScrollToCallbackHelper.notifyCalled();
+        }
+    }
+
+    @Override
+    protected TestDependencyFactory createTestDependencyFactory() {
+        return new TestDependencyFactory() {
+            @Override
+            public AwTestContainerView createAwTestContainerView(AwTestRunnerActivity activity) {
+                return new ScrollTestContainerView(activity);
+            }
+        };
+    }
+
+    private String makeTestPage(String observerName) {
+        String headers =
+            "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"> " +
+            "<style type=\"text/css\"> " +
+            "   div { " +
+            "      width:1000px; " +
+            "      height:10000px; " +
+            "      background-color: blue; " +
+            "   } " +
+            "</style> ";
+        if (observerName != null) {
+            headers +=
+            "<script> " +
+            "   window.onscroll = function(oEvent) { " +
+            "       " + observerName + ".notifyJava(); " +
+            "   } " +
+            "</script>";
+        }
+        return CommonResources.makeHtmlPageFrom(headers, "<div>test div</div>");
+    }
+
+    private void scrollToOnMainSync(final View view, final int xPix, final int yPix) {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                view.scrollTo(xPix, yPix);
+            }
+        });
+    }
+
+    private void assertScrollOffset(AwContents awContents, TestAwContentsClient contentsClient,
+            int xCss, int yCss) throws Exception {
+        String x = executeJavaScriptAndWaitForResult(awContents, contentsClient, "window.scrollX");
+        String y = executeJavaScriptAndWaitForResult(awContents, contentsClient, "window.scrollY");
+        assertEquals(Integer.toString(xCss), x);
+        assertEquals(Integer.toString(yCss), y);
+    }
+
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    public void testUiScrollReflectedInJs() throws Throwable {
+        final TestAwContentsClient contentsClient = new TestAwContentsClient();
+        final ScrollTestContainerView testContainerView =
+            (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+        final double deviceDIPScale =
+            DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+        final int targetScrollXCss = 233;
+        final int targetScrollYCss = 322;
+        final int targetScrollXPix = (int) (targetScrollXCss * deviceDIPScale);
+        final int targetScrollYPix = (int) (targetScrollYCss * deviceDIPScale);
+        final JavascriptEventObserver observer = new JavascriptEventObserver();
+
+        enableJavaScriptOnUiThread(testContainerView.getAwContents());
+
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                observer.register(testContainerView.getContentViewCore(), "javaObserver");
+            }
+        });
+        loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
+                makeTestPage("javaObserver"), "text/html", false);
+
+        scrollToOnMainSync(testContainerView, targetScrollXPix, targetScrollYPix);
+
+        observer.waitForEvent(SCROLL_OFFSET_PROPAGATION_TIMEOUT_MS);
+        assertScrollOffset(testContainerView.getAwContents(), contentsClient,
+                targetScrollXCss, targetScrollYCss);
+    }
+
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    public void testJsScrollReflectedInUi() throws Throwable {
+        final TestAwContentsClient contentsClient = new TestAwContentsClient();
+        final ScrollTestContainerView testContainerView =
+            (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+        final double deviceDIPScale =
+            DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+        final int targetScrollXCss = 132;
+        final int targetScrollYCss = 243;
+        final int targetScrollXPix = (int) (targetScrollXCss * deviceDIPScale);
+        final int targetScrollYPix = (int) (targetScrollYCss * deviceDIPScale);
+
+        enableJavaScriptOnUiThread(testContainerView.getAwContents());
+        loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
+                makeTestPage(null), "text/html", false);
+
+        final CallbackHelper onScrollToCallbackHelper =
+            testContainerView.getOnScrollToCallbackHelper();
+        final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
+        executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
+                "window.scrollTo(" + targetScrollXCss + "," + targetScrollYCss + ");");

[joth, 2013/06/18 03:19:50]

maybe easier as:
String.format("window.scrollTo(%d, %d);", targetScrollXCs, targetScrollYCss);

(check the format string - I haven't read the spec.)

[mkosiba (inactive), 2013/06/18 18:09:25]

Done.

+        onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
+
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                assertEquals(targetScrollXPix, testContainerView.getScrollX());
+                assertEquals(targetScrollYPix, testContainerView.getScrollY());
+            }
+        });
+    }
+
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    public void testJsScrollCanBeAlteredByUi() throws Throwable {
+        final TestAwContentsClient contentsClient = new TestAwContentsClient();
+        final ScrollTestContainerView testContainerView =
+            (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+        final double deviceDIPScale =
+            DeviceDisplayInfo.create(testContainerView.getContext()).getDIPScale();
+        final int targetScrollXCss = 132;
+        final int targetScrollYCss = 243;
+        final int targetScrollXPix = (int) (targetScrollXCss * deviceDIPScale);
+        final int targetScrollYPix = (int) (targetScrollYCss * deviceDIPScale);
+
+        final int maxScrollXCss = 101;
+        final int maxScrollYCss = 201;
+        final int maxScrollXPix = (int) (maxScrollXCss * deviceDIPScale);
+        final int maxScrollYPix = (int) (maxScrollYCss * deviceDIPScale);
+
+        loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
+                makeTestPage(null), "text/html", false);
+
+        enableJavaScriptOnUiThread(testContainerView.getAwContents());
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                testContainerView.setMaxScrollX(maxScrollXPix);
+                testContainerView.setMaxScrollY(maxScrollYPix);
+            }
+        });
+
+        final CallbackHelper onScrollToCallbackHelper =
+            testContainerView.getOnScrollToCallbackHelper();
+        final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
+        executeJavaScriptAndWaitForResult(testContainerView.getAwContents(), contentsClient,
+                "window.scrollTo(" + targetScrollXCss + "," + targetScrollYCss + ")");
+        onScrollToCallbackHelper.waitForCallback(scrollToCallCount);
+
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                assertEquals(maxScrollXPix, testContainerView.getScrollX());
+                assertEquals(maxScrollYPix, testContainerView.getScrollY());
+            }
+        });
+    }
+
+    @SmallTest
+    @Feature({"AndroidWebView"})
+    public void testTouchScrollCanBeAlteredByUi() throws Throwable {
+        final TestAwContentsClient contentsClient = new TestAwContentsClient();
+        final ScrollTestContainerView testContainerView =
+            (ScrollTestContainerView) createAwTestContainerViewOnMainSync(contentsClient);
+        final int targetScrollXPix = 132;
+        final int targetScrollYPix = 243;
+
+        final int maxScrollXPix = 101;
+        final int maxScrollYPix = 201;
+
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                testContainerView.setMaxScrollX(maxScrollXPix);
+                testContainerView.setMaxScrollY(maxScrollYPix);
+            }
+        });
+
+        loadDataSync(testContainerView.getAwContents(), contentsClient.getOnPageFinishedHelper(),
+                makeTestPage(null), "text/html", false);
+
+        final int dragSteps = 4;
+        final CallbackHelper onScrollToCallbackHelper =
+            testContainerView.getOnScrollToCallbackHelper();
+        final int scrollToCallCount = onScrollToCallbackHelper.getCallCount();
+        // TODO: argh.. why does this not work ??
+        TestTouchUtils.dragCompleteView(getInstrumentation(), testContainerView,
+                0, 0, targetScrollXPix, targetScrollXPix, dragSteps);
+        onScrollToCallbackHelper.waitForCallback(scrollToCallCount, dragSteps);
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                assertEquals(maxScrollXPix, testContainerView.getScrollX());
+                assertEquals(maxScrollYPix, testContainerView.getScrollY());
+            }
+        });
+    }
+}