Index: third_party/WebKit/LayoutTests/intersection-observer/display-none.html |
diff --git a/third_party/WebKit/LayoutTests/intersection-observer/display-none.html b/third_party/WebKit/LayoutTests/intersection-observer/display-none.html |
index df0541adf055888b7fd9acbbf416401b6d4f6996..58b166291ce613cbcd4c3dde6d0b48cfdf2f2aea 100644 |
--- a/third_party/WebKit/LayoutTests/intersection-observer/display-none.html |
+++ b/third_party/WebKit/LayoutTests/intersection-observer/display-none.html |
@@ -1,6 +1,6 @@ |
<!DOCTYPE html> |
-<script src="../resources/js-test.js"></script> |
-<script src="../resources/intersection-observer-helper-functions.js"></script> |
+<script src="../resources/testharness.js"></script> |
+<script src="../resources/testharnessreport.js"></script> |
<style> |
#root { |
display: inline-block; |
@@ -14,103 +14,101 @@ |
height: 100px; |
} |
</style> |
-<div style="width:100%; height:700px;"></div> |
+<div id="leading-space" style="width:100%; height:700px;"></div> |
<div id="root"> |
<div style="width:100px; height: 300px;"></div> |
<div id="target"></div> |
<div style="width:100%;height:700px;"></div> |
</div> |
-<div style="width:100%;height:700px;"></div> |
+<div id="trailing-space" style="width:100%;height:700px;"></div> |
<script> |
-description("Test that setting display:none will send a not-intersecting notification."); |
-var target = document.getElementById("target"); |
-var root = document.getElementById("root"); |
-var entries = []; |
-var observer = new IntersectionObserver( |
- changes => { entries = entries.concat(changes) }, |
- { root: document.getElementById("root") } |
-); |
+function waitForNotification(f) { |
+ requestAnimationFrame(() => { |
+ setTimeout(() => { |
+ setTimeout(f); |
+ }); |
+ }); |
+} |
onload = function() { |
+ var t = async_test("Test that setting display:none will send a not-intersecting notification."); |
+ |
+ 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 = document.getElementById("target"); |
+ var root = document.getElementById("root"); |
+ var entries = []; |
+ var observer = new IntersectionObserver(function(changes) { |
+ entries = entries.concat(changes) |
+ }, { root: document.getElementById("root") }); |
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 = 600; |
- 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); |
- root.scrollTop = 150; |
- waitForNotification(step2); |
-} |
+ function step0() { |
+ test(function() { assert_equals(entries.length, 0) }, "entries.length == 0"); |
+ document.scrollingElement.scrollTop = 600; |
+ waitForNotification(step1); |
+ } |
-function step2() { |
- shouldBeEqualToNumber("entries.length", 1); |
- if (entries.length > 0) { |
- shouldBeEqualToNumber("entries[0].boundingClientRect.left", 11); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.right", 111); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.top", 261); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.bottom", 361); |
- shouldBeEqualToNumber("entries[0].intersectionRect.left", 11); |
- shouldBeEqualToNumber("entries[0].intersectionRect.right", 111); |
- shouldBeEqualToNumber("entries[0].intersectionRect.top", 261); |
- shouldBeEqualToNumber("entries[0].intersectionRect.bottom", 311); |
- shouldBeEqualToNumber("entries[0].rootBounds.left", 11); |
- shouldBeEqualToNumber("entries[0].rootBounds.right", 111); |
- shouldBeEqualToNumber("entries[0].rootBounds.top", 111); |
- shouldBeEqualToNumber("entries[0].rootBounds.bottom", 311); |
- shouldEvaluateToSameObject("entries[0].target", target); |
+ function step1() { |
+ test(function() { assert_equals(entries.length, 0) }, "entries.length == 0"); |
+ root.scrollTop = 150; |
+ waitForNotification(step2); |
} |
- target.style.display = "none"; |
- waitForNotification(step3); |
-} |
-function step3() { |
- shouldBeEqualToNumber("entries.length", 2); |
- if (entries.length > 1) { |
- shouldBeEqualToNumber("entries[1].boundingClientRect.left", 0); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.right", 0); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.top", 0); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.bottom", 0); |
- 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", 0); |
- shouldBeEqualToNumber("entries[1].rootBounds.top", 0); |
- shouldBeEqualToNumber("entries[1].rootBounds.bottom", 0); |
- shouldEvaluateToSameObject("entries[1].target", target); |
+ function step2() { |
+ checkEntry(0, [11, 111, 261, 361, 11, 111, 261, 311, 11, 111, 111, 311, target]); |
+ target.style.display = "none"; |
+ waitForNotification(step3); |
} |
- target.style.display = ""; |
- waitForNotification(step4); |
-} |
-function step4() { |
- shouldBeEqualToNumber("entries.length", 3); |
- if (entries.length > 2) { |
- shouldBeEqualToNumber("entries[2].boundingClientRect.left", 11); |
- shouldBeEqualToNumber("entries[2].boundingClientRect.right", 111); |
- shouldBeEqualToNumber("entries[2].boundingClientRect.top", 261); |
- shouldBeEqualToNumber("entries[2].boundingClientRect.bottom", 361); |
- shouldBeEqualToNumber("entries[2].intersectionRect.left", 11); |
- shouldBeEqualToNumber("entries[2].intersectionRect.right", 111); |
- shouldBeEqualToNumber("entries[2].intersectionRect.top", 261); |
- shouldBeEqualToNumber("entries[2].intersectionRect.bottom", 311); |
- shouldBeEqualToNumber("entries[2].rootBounds.left", 11); |
- shouldBeEqualToNumber("entries[2].rootBounds.right", 111); |
- shouldBeEqualToNumber("entries[2].rootBounds.top", 111); |
- shouldBeEqualToNumber("entries[2].rootBounds.bottom", 311); |
- shouldEvaluateToSameObject("entries[2].target", target); |
+ function step3() { |
+ checkEntry(1, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, target]); |
+ target.style.display = ""; |
+ waitForNotification(step4); |
} |
- finishJSTest(); |
-} |
+ function step4() { |
+ checkEntry(2, [11, 111, 261, 361, 11, 111, 261, 311, 11, 111, 111, 311, target]); |
+ document.getElementById("leading-space").style.height = ""; |
+ document.getElementById("trailing-space").style.height = ""; |
+ t.done(); |
+ } |
+}; |
</script> |