Diff
Modified: trunk/LayoutTests/ChangeLog (188508 => 188509)
--- trunk/LayoutTests/ChangeLog 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/ChangeLog 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,3 +1,33 @@
+2015-08-14 Alexey Proskuryakov <a...@apple.com>
+
+ Clean up js-test use in scroll-snap tests
+ https://bugs.webkit.org/show_bug.cgi?id=148046
+
+ Reviewed by Brent Fulgham.
+
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt:
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html:
+
2015-08-14 Jon Honeycutt <jhoneyc...@apple.com>
Rebase some WK2 test results to include the frame scroll pos. Move the
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,8 +1,5 @@
Tests that the scroll-snap feature works properly in iframes.
-PASS successfullyParsed is true
-
-TEST COMPLETE
Testing scroll-snap glide for horizontalTarget:
PASS div scrolled to next window.
Testing scroll-snap snap for horizontalTarget:
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-iframe.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -18,8 +18,10 @@
margin: 2px;
}
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var iframeScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -41,12 +43,6 @@
return position;
}
- function finishTest()
- {
- finishJSTest();
- testRunner.notifyDone();
- }
-
function checkForScrollSnap(targetLabel)
{
var iframeTarget = document.getElementById(targetLabel);
@@ -64,7 +60,7 @@
if (targetLabel == 'horizontalTarget')
setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
else
- finishTest();
+ finishJSTest();
}
function scrollSnapTest(targetLabel)
@@ -153,10 +149,6 @@
function onLoad()
{
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
}
@@ -170,6 +162,5 @@
<iframe id="verticalTarget" class="verticalGallery" src="" style="height: 300px; width: 300px"></iframe>
<div id="console"></div>
</div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,6 +1,3 @@
-PASS successfullyParsed is true
-
-TEST COMPLETE
PASS div successfully scrolled diagonally.
PASS div successfully snapped diagonally.
PASS div successfully snapped after dragging along one axis and then scrolling in the other.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-2d-overflow.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -35,24 +35,21 @@
margin-top: 0px;
}
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divTarget;
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
var divScrollPositionBeforeSingleAxisGlide;
- function finishTest() {
- finishJSTest();
- testRunner.notifyDone();
- }
-
function checkForSingleAxisGlide() {
if (divTarget.scrollTop == divScrollPositionBeforeSingleAxisGlide.y + 400 && divTarget.scrollLeft == divScrollPositionBeforeSingleAxisGlide.x)
testPassed("div successfully snapped after dragging along one axis and then scrolling in the other.");
else
testFailed("div did not honor 2D snap points. (single axis scroll followed by flick on other axis)");
- finishTest();
+ finishJSTest();
}
function scrollAndGlideInSingleAxisTest() {
@@ -132,10 +129,6 @@
function onLoad() {
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(scrollGlideTest, 0);
} else {
@@ -161,6 +154,5 @@
<div class="cell"></div><div class="cell" id="green"></div><div class="cell"></div><br/>
<div class="cell"></div><div class="cell" id="green"></div><div class="cell"></div>
</div>
- <script src=""
</body>
</html>
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,8 +1,5 @@
Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
PASS div scrolled to next window.
Testing scroll-snap snap for horizontalTarget:
PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-borders.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -51,8 +51,10 @@
#itemH4, #itemV4 { background-color: yellow; }
#itemH5, #itemV5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -74,12 +76,6 @@
return position;
}
- function finishTest()
- {
- finishJSTest();
- testRunner.notifyDone();
- }
-
function checkForScrollSnap(targetLabel)
{
var divTarget = document.getElementById(targetLabel);
@@ -97,7 +93,7 @@
if (targetLabel == 'horizontalTarget')
setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
else
- finishTest();
+ finishJSTest();
}
function scrollSnapTest(targetLabel)
@@ -184,10 +180,6 @@
function onLoad()
{
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
@@ -234,6 +226,5 @@
</div>
<div id="console"></div>
</div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,6 +1,6 @@
+PASS div scrolled to next window.
+PASS div honored snap points.
PASS successfullyParsed is true
TEST COMPLETE
-PASS div scrolled to next window.
-PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-horizontal.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -22,8 +22,10 @@
#item4 { background-color: yellow; }
#item5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divTarget;
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
else
testPassed("div honored snap points.");
- testRunner.notifyDone();
+ finishJSTest();
}
function scrollSnapTest() {
@@ -91,8 +93,6 @@
function onLoad() {
if (window.eventSender) {
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(scrollGlideTest, 0);
} else {
@@ -118,6 +118,5 @@
<div id="item3" class="colorBox"></div>
<div id="item4" class="colorBox"></div>
<div id="item5" class="colorBox"></div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,6 +1,6 @@
+PASS div scrolled to next window.
+PASS div honored snap points.
PASS successfullyParsed is true
TEST COMPLETE
-PASS div scrolled to next window.
-PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-horizontal.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -22,8 +22,10 @@
#item4 { background-color: yellow; }
#item5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divTarget;
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
else
testPassed("div honored snap points.");
- testRunner.notifyDone();
+ finishJSTest();
}
function scrollSnapTest() {
@@ -91,8 +93,6 @@
function onLoad() {
if (window.eventSender) {
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(scrollGlideTest, 0);
} else {
@@ -118,6 +118,5 @@
<div id="item3" class="colorBox"></div>
<div id="item4" class="colorBox"></div>
<div id="item5" class="colorBox"></div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,6 +1,6 @@
+PASS div scrolled to next window.
+PASS div honored snap points.
PASS successfullyParsed is true
TEST COMPLETE
-PASS div scrolled to next window.
-PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-slow-vertical.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -22,8 +22,10 @@
#item4 { background-color: yellow; }
#item5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divTarget;
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
else
testPassed("div honored snap points.");
- testRunner.notifyDone();
+ finishJSTest();
}
function scrollSnapTest() {
@@ -91,8 +93,6 @@
function onLoad() {
if (window.eventSender) {
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(scrollGlideTest, 0);
} else {
@@ -118,6 +118,5 @@
<div id="item3" class="colorBox"></div>
<div id="item4" class="colorBox"></div>
<div id="item5" class="colorBox"></div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,6 +1,6 @@
+PASS div scrolled to next window.
+PASS div honored snap points.
PASS successfullyParsed is true
TEST COMPLETE
-PASS div scrolled to next window.
-PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-mainframe-vertical.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -22,8 +22,10 @@
#item4 { background-color: yellow; }
#item5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divTarget;
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -35,7 +37,7 @@
else
testPassed("div honored snap points.");
- testRunner.notifyDone();
+ finishJSTest();
}
function scrollSnapTest() {
@@ -91,8 +93,6 @@
function onLoad() {
if (window.eventSender) {
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(scrollGlideTest, 0);
} else {
@@ -118,6 +118,5 @@
<div id="item3" class="colorBox"></div>
<div id="item4" class="colorBox"></div>
<div id="item5" class="colorBox"></div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,8 +1,5 @@
Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
PASS div scrolled to next window.
Testing scroll-snap snap for horizontalTarget:
PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,8 +1,5 @@
Tests that the scroll-snap feature works properly in overflow regions when using a mechanical mouse wheel.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS div honored snap points.
+ PASS div honored snap points.
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow-stateless.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -18,13 +18,9 @@
#item0, #item2 { background-color: red; }
#item1 { background-color: green; }
</style>
- <script src=""
+ <script src=""
<script>
- function finishTest()
- {
- finishJSTest();
- testRunner.notifyDone();
- }
+ window.jsTestIsAsync = true;
function locationInWindowCoordinates(element)
{
@@ -63,7 +59,7 @@
else
testPassed("div honored snap points.");
- finishTest();
+ finishJSTest();
}, 2000);
}
@@ -71,10 +67,6 @@
function onLoad()
{
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(scrollSnapTest, 0);
} else {
@@ -102,6 +94,5 @@
</div>
<div id="console"></div>
</div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-overflow.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -41,8 +41,10 @@
#itemH4, #itemV4 { background-color: yellow; }
#itemH5, #itemV5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -64,12 +66,6 @@
return position;
}
- function finishTest()
- {
- finishJSTest();
- testRunner.notifyDone();
- }
-
function checkForScrollSnap(targetLabel)
{
var divTarget = document.getElementById(targetLabel);
@@ -87,7 +83,7 @@
if (targetLabel == 'horizontalTarget')
setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
else
- finishTest();
+ finishJSTest();
}
function scrollSnapTest(targetLabel)
@@ -174,10 +170,6 @@
function onLoad()
{
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
@@ -224,6 +216,5 @@
</div>
<div id="console"></div>
</div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,8 +1,5 @@
Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
PASS div scrolled to next window.
Testing scroll-snap snap for horizontalTarget:
PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-padding.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -49,8 +49,10 @@
#itemH4, #itemV4 { background-color: yellow; }
#itemH5, #itemV5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -72,12 +74,6 @@
return position;
}
- function finishTest()
- {
- finishJSTest();
- testRunner.notifyDone();
- }
-
function checkForScrollSnap(targetLabel)
{
var divTarget = document.getElementById(targetLabel);
@@ -95,7 +91,7 @@
if (targetLabel == 'horizontalTarget')
setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
else
- finishTest();
+ finishJSTest();
}
function scrollSnapTest(targetLabel)
@@ -184,10 +180,6 @@
function onLoad()
{
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
@@ -234,6 +226,5 @@
</div>
<div id="console"></div>
</div>
- <script src=""
</body>
</html>
\ No newline at end of file
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated-expected.txt 2015-08-15 05:51:04 UTC (rev 188509)
@@ -1,8 +1,5 @@
Tests that the scroll-snap feature works properly in overflow regions.
- PASS successfullyParsed is true
-
-TEST COMPLETE
-Testing scroll-snap glide for horizontalTarget:
+ Testing scroll-snap glide for horizontalTarget:
PASS div scrolled to next window.
Testing scroll-snap snap for horizontalTarget:
PASS div honored snap points.
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html (188508 => 188509)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html 2015-08-15 05:44:46 UTC (rev 188508)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-rotated.html 2015-08-15 05:51:04 UTC (rev 188509)
@@ -43,8 +43,10 @@
#itemH4, #itemV4 { background-color: yellow; }
#itemH5, #itemV5 { background-color: fuchsia; }
</style>
- <script src=""
+ <script src=""
<script>
+ window.jsTestIsAsync = true;
+
var divScrollPositionBeforeGlide;
var divScrollPositionBeforeSnap;
@@ -66,12 +68,6 @@
return position;
}
- function finishTest()
- {
- finishJSTest();
- testRunner.notifyDone();
- }
-
function checkForScrollSnap(targetLabel)
{
var divTarget = document.getElementById(targetLabel);
@@ -89,7 +85,7 @@
if (targetLabel == 'horizontalTarget')
setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
else
- finishTest();
+ finishJSTest();
}
function scrollSnapTest(targetLabel)
@@ -176,10 +172,6 @@
function onLoad()
{
if (window.eventSender) {
- window.jsTestIsAsync = true;
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-
eventSender.monitorWheelEvents();
setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
} else {
@@ -226,6 +218,5 @@
</div>
<div id="console"></div>
</div>
- <script src=""
</body>
-</html>
\ No newline at end of file
+</html>
