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

Unified Diff: LayoutTests/fast/scroll-behavior/overflow-scroll-animates.html

Issue 1006423007: Fix timeouts in overflow-scroll-animates.html with threaded compositing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months 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
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/scroll-behavior/overflow-scroll-animates.html
diff --git a/LayoutTests/fast/scroll-behavior/overflow-scroll-animates.html b/LayoutTests/fast/scroll-behavior/overflow-scroll-animates.html
index a88a2b79f3f4605999b213d809ac23d3fd2862fc..3d960ed772e753e8e181b489d2a5d05e72a2d64b 100644
--- a/LayoutTests/fast/scroll-behavior/overflow-scroll-animates.html
+++ b/LayoutTests/fast/scroll-behavior/overflow-scroll-animates.html
@@ -8,8 +8,8 @@
}
#content {
- width: 7500px;
- height: 7500px;
+ width: 750px;
+ height: 750px;
background-color: blue;
}
@@ -39,16 +39,19 @@ function nextConfig() {
element.addEventListener("scroll", onElementScroll);
- eventSender.mouseMoveTo(100, 100);
- eventSender.mouseScrollBy(0, -2, /* paged */ false,
- config.preciseDeltas);
- scrollStart = performance.now();
+ testRunner.displayAsyncThen(function() {
+ eventSender.mouseMoveTo(100, 100);
+ eventSender.mouseScrollBy(0, -2, /* paged */ false,
+ config.preciseDeltas);
+ scrollStart = performance.now();
+ });
}
function reset() {
element.removeEventListener("scroll", onElementScroll);
element.scrollTop = 0;
waitingForScroll = false;
+ scrollStart = undefined;
}
function onElementScroll() {
@@ -59,6 +62,8 @@ function onElementScroll() {
reset();
nextConfig();
}
+ } else if (!scrollStart) {
+ return;
} else if (config.expectSmooth) {
shouldNotBe("element.scrollTop", "80");
waitingForScroll = true;
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698