Fixed layout tests to be scroll order agnostic

This is needed as a prerequisite to making "visual viewport scrolls first"
the default. Scrolling the page before setting scale means that the layout
viewport is the only one that could scroll.

BUG=443724

Review URL: https://codereview.chromium.org/1301523006

git-svn-id: svn://svn.chromium.org/blink/trunk@201135 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/fast/dom/elementFromPoint-scaled-scrolled.html

@@ -8,9 +8,10 @@
 <div id="result"></div>
 <script>
 function runTest() {
+    // Scroll before scaling so we scroll the layout viewport rather than the visual.
+    window.scrollTo(100,100);
     if (window.internals)
         window.internals.setPageScaleFactor(2);
-    window.scrollTo(100,100);
 
     if (window.testRunner)
         testRunner.dumpAsText();

third_party/WebKit/LayoutTests/fast/dom/zoom-scroll-page-test-expected.txt

@@ -7,63 +7,63 @@ PASS successfullyParsed is true
 
 TEST COMPLETE
 Testing at zoom -1 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -3 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -3 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -3 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -3 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -2 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -2 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -2 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -2 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -1 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -1 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -1 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom -1 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 0 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 0 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 0 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 0 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 1 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 1 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 1 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 1 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 3 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 3 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 3 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 3 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 5 and scale 0.75
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 5 and scale 1
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 5 and scale 1.2
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 Testing at zoom 5 and scale 1.6
-PASS window.pageYOffset is within 3 of 231
+PASS window.pageYOffset is within 4 of 231
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/dom/zoom-scroll-page-test.html

@@ -27,7 +27,7 @@
                 zoomBy(zoomFactor);
                 window.scrollTo(10, 10);
                 window.scrollBy(0, y);
-                shouldBeCloseTo('window.pageYOffset', y+10, 3, false);
+                shouldBeCloseTo('window.pageYOffset', y+10, 4, false);
                 zoomBy(-zoomFactor);
             }
             else

third_party/WebKit/LayoutTests/fast/events/touch/touch-scaled-scrolled.html

@@ -13,9 +13,10 @@ function touched(e) {
 }
 
 function runTest() {
+    // Scroll before scaling so we scroll the layout viewport rather than the visual.
+    window.scrollTo(100,100);
     if (window.internals)
         window.internals.setPageScaleFactor(2);
-    window.scrollTo(100,100);
 
     if (window.testRunner) {
         testRunner.dumpAsText();