Index: third_party/WebKit/LayoutTests/intersection-observer/same-document-no-root.html |
diff --git a/third_party/WebKit/LayoutTests/intersection-observer/same-document-no-root.html b/third_party/WebKit/LayoutTests/intersection-observer/same-document-no-root.html |
index 168a2cfce38091a43a5ed2cf94e3eea1f34e1e6f..5d8a01b82285952ccb694fcc3a6312d4aff068d8 100644 |
--- a/third_party/WebKit/LayoutTests/intersection-observer/same-document-no-root.html |
+++ b/third_party/WebKit/LayoutTests/intersection-observer/same-document-no-root.html |
@@ -6,68 +6,67 @@ |
<div style="width:100%; height:700px;"></div> |
<script> |
- description("Simple intersection observer test with no explicit root and one document."); |
- var target = document.getElementById("target"); |
- var entries = []; |
- observer_callback = function(changes) { |
- for (var i in changes) |
- entries.push(changes[i]); |
- }; |
- var observer = new IntersectionObserver(observer_callback, {}); |
- observer.observe(target); |
- |
- onload = function() { |
- shouldBeEqualToNumber("entries.length", 0); |
- document.scrollingElement.scrollTop = 300; |
- requestAnimationFrame(step1); |
- }; |
+description("Simple intersection observer test with no explicit root and one document."); |
+var target = document.getElementById("target"); |
+var entries = []; |
+var observer = new IntersectionObserver(changes => { entries = entries.concat(changes) }); |
- function step1() { |
- setTimeout(function() { |
- shouldBeEqualToNumber("entries.length", 1); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.left", 8); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.right", 108); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.top", 408); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.bottom", 508); |
- shouldBeEqualToNumber("entries[0].intersectionRect.left", 8); |
- shouldBeEqualToNumber("entries[0].intersectionRect.right", 108); |
- shouldBeEqualToNumber("entries[0].intersectionRect.top", 408); |
- shouldBeEqualToNumber("entries[0].intersectionRect.bottom", 508); |
- shouldBeEqualToNumber("entries[0].rootBounds.left", 0); |
- shouldBeEqualToNumber("entries[0].rootBounds.right", 785); |
- shouldBeEqualToNumber("entries[0].rootBounds.top", 0); |
- shouldBeEqualToNumber("entries[0].rootBounds.bottom", 600); |
- shouldEvaluateToSameObject("entries[0].target", target); |
+onload = function() { |
+ observer.observe(target); |
+ entries = entries.concat(observer.takeRecords()); |
+ shouldBeEqualToNumber("entries.length", 0); |
+ document.scrollingElement.scrollTop = 300; |
+ // See README for explanation of double RAF. |
+ requestAnimationFrame(() => { requestAnimationFrame(step1) }); |
+}; |
- // ClientRect members of IntersectionObserverEntry should be stable. |
- shouldEvaluateToSameObject("entries[0].boundingClientRect", entries[0].boundingClientRect); |
- shouldEvaluateToSameObject("entries[0].intersectionRect", entries[0].intersectionRect); |
- shouldEvaluateToSameObject("entries[0].rootBounds", entries[0].rootBounds); |
+function step1() { |
+ entries = entries.concat(observer.takeRecords()); |
+ shouldBeEqualToNumber("entries.length", 1); |
+ if (entries.length > 0) { |
+ shouldBeEqualToNumber("entries[0].boundingClientRect.left", 8); |
+ shouldBeEqualToNumber("entries[0].boundingClientRect.right", 108); |
+ shouldBeEqualToNumber("entries[0].boundingClientRect.top", 408); |
+ shouldBeEqualToNumber("entries[0].boundingClientRect.bottom", 508); |
+ shouldBeEqualToNumber("entries[0].intersectionRect.left", 8); |
+ shouldBeEqualToNumber("entries[0].intersectionRect.right", 108); |
+ shouldBeEqualToNumber("entries[0].intersectionRect.top", 408); |
+ shouldBeEqualToNumber("entries[0].intersectionRect.bottom", 508); |
+ shouldBeEqualToNumber("entries[0].rootBounds.left", 0); |
+ shouldBeEqualToNumber("entries[0].rootBounds.right", 785); |
+ shouldBeEqualToNumber("entries[0].rootBounds.top", 0); |
+ shouldBeEqualToNumber("entries[0].rootBounds.bottom", 600); |
+ shouldEvaluateToSameObject("entries[0].target", target); |
- document.scrollingElement.scrollTop = 100; |
- requestAnimationFrame(step2); |
- }); |
+ // ClientRect members of IntersectionObserverEntry should be stable. |
+ shouldEvaluateToSameObject("entries[0].boundingClientRect", entries[0].boundingClientRect); |
+ shouldEvaluateToSameObject("entries[0].intersectionRect", entries[0].intersectionRect); |
+ shouldEvaluateToSameObject("entries[0].rootBounds", entries[0].rootBounds); |
} |
+ document.scrollingElement.scrollTop = 100; |
+ requestAnimationFrame(step2); |
+} |
- function step2() { |
- setTimeout(function() { |
- shouldBeEqualToNumber("entries.length", 2); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.left", 8); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.right", 108); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.top", 608); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.bottom", 708); |
- shouldBeEqualToNumber("entries[1].intersectionRect.left", 0); |
- shouldBeEqualToNumber("entries[1].intersectionRect.right", 0); |
- shouldBeEqualToNumber("entries[1].intersectionRect.top", 0); |
- shouldBeEqualToNumber("entries[1].intersectionRect.bottom", 0); |
- shouldBeEqualToNumber("entries[1].rootBounds.left", 0); |
- shouldBeEqualToNumber("entries[1].rootBounds.right", 785); |
- shouldBeEqualToNumber("entries[1].rootBounds.top", 0); |
- shouldBeEqualToNumber("entries[1].rootBounds.bottom", 600); |
- shouldEvaluateToSameObject("entries[1].target", target); |
- finishJSTest(); |
- document.scrollingElement.scrollTop = 0; |
- }); |
+function step2() { |
+ entries = entries.concat(observer.takeRecords()); |
+ shouldBeEqualToNumber("entries.length", 2); |
+ if (entries.length > 1) { |
+ shouldBeEqualToNumber("entries[1].boundingClientRect.left", 8); |
+ shouldBeEqualToNumber("entries[1].boundingClientRect.right", 108); |
+ shouldBeEqualToNumber("entries[1].boundingClientRect.top", 608); |
+ shouldBeEqualToNumber("entries[1].boundingClientRect.bottom", 708); |
+ shouldBeEqualToNumber("entries[1].intersectionRect.left", 0); |
+ shouldBeEqualToNumber("entries[1].intersectionRect.right", 0); |
+ shouldBeEqualToNumber("entries[1].intersectionRect.top", 0); |
+ shouldBeEqualToNumber("entries[1].intersectionRect.bottom", 0); |
+ shouldBeEqualToNumber("entries[1].rootBounds.left", 0); |
+ shouldBeEqualToNumber("entries[1].rootBounds.right", 785); |
+ shouldBeEqualToNumber("entries[1].rootBounds.top", 0); |
+ shouldBeEqualToNumber("entries[1].rootBounds.bottom", 600); |
+ shouldEvaluateToSameObject("entries[1].target", target); |
} |
+ finishJSTest(); |
+ document.scrollingElement.scrollTop = 0; |
+} |
</script> |