Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1256)

Unified Diff: third_party/WebKit/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html

Issue 1413493005: Update layout tests to work when smooth scrolling is enabled by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: worked on nit Created 5 years, 1 month 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
Download patch
Index: third_party/WebKit/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
diff --git a/third_party/WebKit/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html b/third_party/WebKit/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
index c6c6572e5af433f6e8e287e2249f3388b9a68c9f..c109a6f0742bbbb8d839efa9ce43c8afd5c8a3a4 100644
--- a/third_party/WebKit/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
+++ b/third_party/WebKit/LayoutTests/fast/events/platform-wheelevent-paging-y-in-scrolling-page.html
@@ -2,6 +2,7 @@
<head>
<script src="../../resources/js-test.js"></script>
<script>
+ window.jsTestIsAsync = true;
var givenScrollTop = 2; // Only page is scrolled per event, regardless of this number.
var givenScrollLeft = 0;
var expectedScrollTop = 525; // Window is 800x600. Scroll 87.5% of visible.
@@ -9,11 +10,7 @@
var event;
var div;
- window.jsTestIsAsync = true;
- if (window.testRunner)
- testRunner.waitUntilDone();
-
- function dispatchWheelEvent()
+ function runTest()
{
document.body.addEventListener("mousewheel", mousewheelHandler, false);
@@ -22,14 +19,9 @@
eventSender.continuousMouseScrollBy(-window.givenScrollLeft, -window.givenScrollTop, true);
}
- setTimeout('checkOffsets();', 100);
- }
-
- function checkOffsets()
- {
- shouldBe("document.scrollingElement.scrollTop", "window.expectedScrollTop");
- shouldBe("document.scrollingElement.scrollLeft", "window.expectedScrollLeft");
- finishJSTest();
+ // This test expects failure on mac: crbug.com/552694.
+ shouldBecomeEqual("document.scrollingElement.scrollTop == window.expectedScrollTop && " +
+ "document.scrollingElement.scrollLeft == window.expectedScrollLeft", "true", finishJSTest);
}
function mousewheelHandler(e)
@@ -46,7 +38,7 @@
</script>
</head>
- <body style="margin:0" onload="setTimeout('dispatchWheelEvent();', 100)">
+ <body style="margin:0" onload="runTest()">
<div style="height:900px;width:400px">
<div style="background-color:red;height:900px;width:200px;position:relative;left:0px;top:0px"></div>
<div style="background-color:green;height:900px;width:200px;position:relative;left:200px;top:-900px"></div>

Powered by Google App Engine
This is Rietveld 408576698