| Index: third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html
|
| diff --git a/third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html b/third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html
|
| index 48a735f05fb3797cbc538bb71b9fb9d979dd2835..1c8a989288e6c9bb647ef6f907909a9f51941dae 100644
|
| --- a/third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html
|
| +++ b/third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html
|
| @@ -1,78 +1,92 @@
|
| <!DOCTYPE html>
|
| -<script src="../resources/js-test.js"></script>
|
| -<script src="../resources/intersection-observer-helper-functions.js"></script>
|
| -<div style="width:100%; height:700px;"></div>
|
| -<iframe id="target-iframe" src="../resources/intersection-observer-subframe.html" style="height: 100px; overflow-y: scroll"></iframe>
|
| -<div style="width:100%; height:700px;"></div>
|
| +<script src="../resources/testharness.js"></script>
|
| +<script src="../resources/testharnessreport.js"></script>
|
| +<div id="leading-space" style="width:100%; height:700px;"></div>
|
| +<iframe id="target-iframe" src="resources/iframe-no-root-subframe.html" style="height: 100px; overflow-y: scroll"></iframe>
|
| +<div id="trailing-space" style="width:100%; height:700px;"></div>
|
|
|
| <script>
|
| -description("Simple intersection observer test with no explicit root and target in an iframe.");
|
| -var entries = [];
|
| -var observer = new IntersectionObserver(changes => { entries = entries.concat(changes) }, {});
|
| -var targetIframe = document.getElementById("target-iframe");
|
| -var target;
|
| -var iframeScroller;
|
| +function waitForNotification(f) {
|
| + requestAnimationFrame(() => {
|
| + setTimeout(() => {
|
| + setTimeout(f);
|
| + });
|
| + });
|
| +}
|
|
|
| +var targetIframe = document.getElementById("target-iframe");
|
| targetIframe.onload = function() {
|
| - target = targetIframe.contentDocument.getElementById("target");
|
| - iframeScroller = targetIframe.contentDocument.scrollingElement;
|
| + var t = async_test("Simple intersection observer test with no explicit root and target in an iframe.");
|
| +
|
| + test(function() { assert_equals(window.innerWidth, 800) }, "Window must be 800 pixels wide.");
|
| + test(function() { assert_equals(window.innerHeight, 600) }, "Window must be 600 pixels high.");
|
| +
|
| + var target = targetIframe.contentDocument.getElementById("target");
|
| + var iframeScroller = targetIframe.contentDocument.scrollingElement;
|
| + var entries = [];
|
| + var observer = new IntersectionObserver(function(changes) {
|
| + entries = entries.concat(changes)
|
| + });
|
| observer.observe(target);
|
| entries = entries.concat(observer.takeRecords());
|
| - shouldBeEqualToNumber("entries.length", 0);
|
| + test(function() { assert_equals(entries.length, 0) }, "No initial notifications.");
|
| waitForNotification(step0);
|
| -}
|
|
|
| -function step0() {
|
| - shouldBeEqualToNumber("entries.length", 0);
|
| - document.scrollingElement.scrollTop = 200;
|
| - waitForNotification(step1);
|
| -}
|
| + function checkEntry(i, expected) {
|
| + test(function() { assert_equals(entries.length, i+1) }, String(i+1) + " notification(s).");
|
| + if (expected && entries.length > i) {
|
| + test(function() { assert_equals(entries[i].boundingClientRect.left, expected[0]) },
|
| + "entries[" + i + "].boundingClientRect.left == " + expected[0]);
|
| + test(function() { assert_equals(entries[i].boundingClientRect.right, expected[1]) },
|
| + "entries[" + i + "].boundingClientRect.right == " + expected[1]);
|
| + test(function() { assert_equals(entries[i].boundingClientRect.top, expected[2]) },
|
| + "entries[" + i + "].boundingClientRect.top == " + expected[2]);
|
| + test(function() { assert_equals(entries[i].boundingClientRect.bottom, expected[3]) },
|
| + "entries[" + i + "].boundingClientRect.bottom == " + expected[3]);
|
| + test(function() { assert_equals(entries[i].intersectionRect.left, expected[4]) },
|
| + "entries[" + i + "].intersectionRect.left == " + expected[4]);
|
| + test(function() { assert_equals(entries[i].intersectionRect.right, expected[5]) },
|
| + "entries[" + i + "].intersectionRect.right == " + expected[5]);
|
| + test(function() { assert_equals(entries[i].intersectionRect.top, expected[6]) },
|
| + "entries[" + i + "].intersectionRect.top == " + expected[6]);
|
| + test(function() { assert_equals(entries[i].intersectionRect.bottom, expected[7]) },
|
| + "entries[" + i + "].intersectionRect.bottom == " + expected[7]);
|
| + test(function() { assert_equals(entries[i].rootBounds.left, expected[8]) },
|
| + "entries[" + i + "].rootBounds.left == " + expected[8]);
|
| + test(function() { assert_equals(entries[i].rootBounds.right, expected[9]) },
|
| + "entries[" + i + "].rootBounds.right == " + expected[9]);
|
| + test(function() { assert_equals(entries[i].rootBounds.top, expected[10]) },
|
| + "entries[" + i + "].rootBounds.top == " + expected[10]);
|
| + test(function() { assert_equals(entries[i].rootBounds.bottom, expected[11]) },
|
| + "entries[" + i + "].rootBounds.bottom == " + expected[11]);
|
| + test(function() { assert_true(entries[i].target === expected[12]) },
|
| + "entries[" + i + "].target === " + expected[12]);
|
| + }
|
| + }
|
|
|
| -function step1() {
|
| - shouldBeEqualToNumber("entries.length", 0);
|
| - iframeScroller.scrollTop = 250;
|
| - waitForNotification(step2);
|
| -}
|
| + function step0() {
|
| + test(function() { assert_equals(entries.length, 0) }, "entries.length == 0");
|
| + document.scrollingElement.scrollTop = 200;
|
| + waitForNotification(step1);
|
| + }
|
|
|
| -function step2() {
|
| - 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", -42);
|
| - shouldBeEqualToNumber("entries[0].boundingClientRect.bottom", 58);
|
| - shouldBeEqualToNumber("entries[0].intersectionRect.left", 8);
|
| - shouldBeEqualToNumber("entries[0].intersectionRect.right", 108);
|
| - shouldBeEqualToNumber("entries[0].intersectionRect.top", 0);
|
| - shouldBeEqualToNumber("entries[0].intersectionRect.bottom", 58);
|
| - 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);
|
| + function step1() {
|
| + test(function() { assert_equals(entries.length, 0) }, "entries.length == 0");
|
| + iframeScroller.scrollTop = 250;
|
| + waitForNotification(step2);
|
| }
|
| - document.scrollingElement.scrollTop = 100;
|
| - waitForNotification(step3);
|
| -}
|
|
|
| -function step3() {
|
| - 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", -42);
|
| - shouldBeEqualToNumber("entries[1].boundingClientRect.bottom", 58);
|
| - 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);
|
| + function step2() {
|
| + checkEntry(0, [8, 108, -42, 58, 8, 108, 0, 58, 0, 785, 0, 600, target]);
|
| + document.scrollingElement.scrollTop = 100;
|
| + waitForNotification(step3);
|
| }
|
| - finishJSTest();
|
| - document.scrollingElement.scrollTop = 0;
|
| -}
|
| +
|
| + function step3() {
|
| + checkEntry(1, [8, 108, -42, 58, 0, 0, 0, 0, 0, 785, 0, 600, target]);
|
| + document.getElementById("leading-space").style.height = "";
|
| + document.getElementById("trailing-space").style.height = "";
|
| + t.done();
|
| + }
|
| +};
|
| </script>
|
|
|