| 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
|
| index 452d4bf121fb494ebfeb14a5c86e542a9e0fc69b..72c9ae8b2b30bda10907f77a9a34a41a77feb8fe 100644
|
| --- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
|
| +++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
|
| @@ -127,26 +127,26 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| String content = TEST_PAGE_COMMON_CONTENT + extraContent;
|
| if (onscrollObserver != null) {
|
| content +=
|
| - "<script> " +
|
| - " window.onscroll = function(oEvent) { " +
|
| - " " + onscrollObserver + ".notifyJava(); " +
|
| - " } " +
|
| - "</script>";
|
| + "<script> " +
|
| + " window.onscroll = function(oEvent) { " +
|
| + " " + onscrollObserver + ".notifyJava(); " +
|
| + " } " +
|
| + "</script>";
|
| }
|
| if (firstFrameObserver != null) {
|
| content +=
|
| - "<script> " +
|
| - " window.framesToIgnore = 10; " +
|
| - " window.onAnimationFrame = function(timestamp) { " +
|
| - " if (window.framesToIgnore == 0) { " +
|
| - " " + firstFrameObserver + ".notifyJava(); " +
|
| - " } else {" +
|
| - " window.framesToIgnore -= 1; " +
|
| - " window.requestAnimationFrame(window.onAnimationFrame); " +
|
| - " } " +
|
| - " }; " +
|
| - " window.requestAnimationFrame(window.onAnimationFrame); " +
|
| - "</script>";
|
| + "<script> " +
|
| + " window.framesToIgnore = 10; " +
|
| + " window.onAnimationFrame = function(timestamp) { " +
|
| + " if (window.framesToIgnore == 0) { " +
|
| + " " + firstFrameObserver + ".notifyJava(); " +
|
| + " } else {" +
|
| + " window.framesToIgnore -= 1; " +
|
| + " window.requestAnimationFrame(window.onAnimationFrame); " +
|
| + " } " +
|
| + " }; " +
|
| + " window.requestAnimationFrame(window.onAnimationFrame); " +
|
| + "</script>";
|
| }
|
| return CommonResources.makeHtmlPageFrom(TEST_PAGE_COMMON_HEADERS, content);
|
| }
|
| @@ -643,7 +643,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| });
|
|
|
| // Wait for the animation to hit the bottom of the page.
|
| - for (int i = 1; ; ++i) {
|
| + for (int i = 1;; ++i) {
|
| onScrollToCallbackHelper.waitForCallback(scrollToCallCount, i);
|
| if (checkScrollOnMainSync(testContainerView, 0, maxScrollYPix))
|
| break;
|
| @@ -681,7 +681,7 @@ public class AndroidScrollIntegrationTest extends AwTestBase {
|
| });
|
|
|
| // Wait for the animation to hit the bottom of the page.
|
| - for (int i = 1; ; ++i) {
|
| + for (int i = 1;; ++i) {
|
| onScrollToCallbackHelper.waitForCallback(scrollToCallCount, i);
|
| if (checkScrollOnMainSync(testContainerView, 0, 0))
|
| break;
|
|
|