Index: third_party/WebKit/LayoutTests/intersection-observer/timestamp.html |
diff --git a/third_party/WebKit/LayoutTests/intersection-observer/timestamp.html b/third_party/WebKit/LayoutTests/intersection-observer/timestamp.html |
index 47f1dcc5cef50b539b05b8a32e2801154e17682c..fa967660c955e23c89cd5aa59c2eebc1c56b2d3e 100644 |
--- a/third_party/WebKit/LayoutTests/intersection-observer/timestamp.html |
+++ b/third_party/WebKit/LayoutTests/intersection-observer/timestamp.html |
@@ -8,6 +8,8 @@ |
description("Test that intersection observer time is relative to time in the callback context."); |
var topWindowEntries = []; |
var iframeWindowEntries = []; |
+var topWindowObserver; |
+var iframeWindowObserver; |
var targetIframe; |
var iframeScroller; |
var topWindowTime; |
@@ -15,36 +17,36 @@ var iframeWindowTime; |
var timestampTolerance = 24; // 1.5 times frame duration. |
function step0() { |
- setTimeout(function() { |
- // Test results are only significant if there's a sufficient gap between |
- // top window time and iframe window time. |
- topWindowTime = performance.now(); |
- iframeWindowTime = targetIframe.contentWindow.performance.now(); |
- shouldBeGreaterThan("topWindowTime - iframeWindowTime", "2 * timestampTolerance"); |
+ // Test results are only significant if there's a sufficient gap between |
+ // top window time and iframe window time. |
+ topWindowTime = performance.now(); |
+ iframeWindowTime = targetIframe.contentWindow.performance.now(); |
+ shouldBeGreaterThan("topWindowTime - iframeWindowTime", "2 * timestampTolerance"); |
- shouldBeEqualToNumber("topWindowEntries.length", 0); |
- shouldBeEqualToNumber("iframeWindowEntries.length", 0); |
- document.scrollingElement.scrollTop = 200; |
- iframeScroller.scrollTop = 250; |
- requestAnimationFrame(step1); |
- }); |
+ topWindowEntries = topWindowEntries.concat(topWindowObserver.takeRecords()); |
+ iframeWindowEntries = iframeWindowEntries.concat(iframeWindowObserver.takeRecords()); |
+ shouldBeEqualToNumber("topWindowEntries.length", 0); |
+ shouldBeEqualToNumber("iframeWindowEntries.length", 0); |
+ document.scrollingElement.scrollTop = 200; |
+ iframeScroller.scrollTop = 250; |
+ requestAnimationFrame(step1); |
} |
function step1() { |
- setTimeout(function() { |
- topWindowTime = performance.now(); |
- iframeWindowTime = targetIframe.contentWindow.performance.now(); |
- shouldBeEqualToNumber("topWindowEntries.length", 1); |
- if (topWindowEntries.length) { |
- shouldBeCloseTo("topWindowEntries[0].time", "topWindowTime", timestampTolerance); |
- } |
- shouldBeEqualToNumber("iframeWindowEntries.length", 1); |
- if (iframeWindowEntries.length) { |
- shouldBeCloseTo("iframeWindowEntries[0].time", "iframeWindowTime", timestampTolerance); |
- } |
- finishJSTest(); |
- document.scrollingElement.scrollTop = 0; |
- }); |
+ topWindowEntries = topWindowEntries.concat(topWindowObserver.takeRecords()); |
+ iframeWindowEntries = iframeWindowEntries.concat(iframeWindowObserver.takeRecords()); |
+ topWindowTime = performance.now(); |
+ iframeWindowTime = targetIframe.contentWindow.performance.now(); |
+ shouldBeEqualToNumber("topWindowEntries.length", 1); |
+ if (topWindowEntries.length) { |
+ shouldBeCloseTo("topWindowEntries[0].time", "topWindowTime", timestampTolerance); |
+ } |
+ shouldBeEqualToNumber("iframeWindowEntries.length", 1); |
+ if (iframeWindowEntries.length) { |
+ shouldBeCloseTo("iframeWindowEntries[0].time", "iframeWindowTime", timestampTolerance); |
+ } |
+ finishJSTest(); |
+ document.scrollingElement.scrollTop = 0; |
} |
function runTest() { |
@@ -53,18 +55,19 @@ function runTest() { |
// Observer created here, callback created in iframe context. Timestamps should be |
// from this window. |
- var observer = new IntersectionObserver(targetIframe.contentDocument.createObserverCallback(topWindowEntries), {}); |
- observer.observe(target); |
+ topWindowObserver = new IntersectionObserver(targetIframe.contentDocument.createObserverCallback(topWindowEntries), {}); |
+ topWindowObserver.observe(target); |
// Callback created here, observer created in iframe. Timestamps should be |
// from iframe window. |
- observer = targetIframe.contentDocument.createObserver(function(newEntries) { |
+ iframeWindowObserver = targetIframe.contentDocument.createObserver(function(newEntries) { |
for (var i = 0; i < newEntries.length; i++) |
iframeWindowEntries.push(newEntries[i]); |
}); |
- observer.observe(target); |
+ iframeWindowObserver.observe(target); |
- step0(); |
+ // See README for explanation of double RAF. |
+ requestAnimationFrame(() => { requestAnimationFrame(step0) }); |
} |
window.onload = function() { |