Index: third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
diff --git a/third_party/WebKit/LayoutTests/intersection-observer/root-margin.html b/third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
index c11458c3d5fa3316a307a5dfe9c1e8acb574ece7..b5af5ce4313946a93e9474327defee24b1f279ef 100644 |
--- a/third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
+++ b/third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
@@ -1,87 +1,97 @@ |
<!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> |
-<div style="white-space: nowrap;"> |
+<script src="../resources/testharness.js"></script> |
+<script src="../resources/testharnessreport.js"></script> |
+ |
+<div id="leading-space" style="width:100%; height:700px;"></div> |
+<div style="white-space:nowrap;"> |
<div style="display: inline-block; width: 1000px; height: 100px"></div> |
<div id="target" style="display: inline-block; background-color: green; width:100px; height:100px"></div> |
<div style="display: inline-block; width: 1000px; height: 100px"></div> |
</div> |
-<div style="width:100%; height:700px;"></div> |
+<div id="trailing-space" style="width:100%; height:700px;"></div> |
<script> |
-description("Intersection observer test with root margin and implicit root."); |
-var target = document.getElementById("target"); |
-var entries = []; |
-var observer = new IntersectionObserver( |
- changes => { entries = entries.concat(changes) }, |
- { rootMargin: "10px 20% 40% 30px" } |
-); |
- |
-shouldNotThrow("new IntersectionObserver(c => {}, { rootMargin: '1.4px' })"); |
-shouldNotThrow("new IntersectionObserver(c => {}, { rootMargin: '1.4px 2px' })"); |
-shouldNotThrow("new IntersectionObserver(c => {}, { rootMargin: '1.4px 2px 3%' })"); |
+function waitForNotification(f) { |
+ requestAnimationFrame(() => { |
+ setTimeout(() => { |
+ setTimeout(f); |
+ }); |
+ }); |
+} |
onload = function() { |
+ var t = async_test("Intersection observer test with root margin and implicit root."); |
+ |
+ 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 entries = []; |
+ var observer = new IntersectionObserver(function(changes) { |
+ entries = entries.concat(changes) |
+ }, { rootMargin: "10px 20% 40% 30px" }); |
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.scrollLeft = 100; |
- 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", 1); |
- if (entries.length > 0) { |
- shouldBeEqualToNumber("entries.length", 1); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.left", 912); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.right", 1012); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.top", 708); |
- shouldBeEqualToNumber("entries[0].boundingClientRect.bottom", 808); |
- shouldBeEqualToNumber("entries[0].intersectionRect.left", 912); |
- shouldBeEqualToNumber("entries[0].intersectionRect.right", 942); |
- shouldBeEqualToNumber("entries[0].intersectionRect.top", 708); |
- shouldBeEqualToNumber("entries[0].intersectionRect.bottom", 808); |
- shouldBeEqualToNumber("entries[0].rootBounds.left", -30); |
- shouldBeEqualToNumber("entries[0].rootBounds.right", 942); |
- shouldBeEqualToNumber("entries[0].rootBounds.top", -10); |
- shouldBeEqualToNumber("entries[0].rootBounds.bottom", 819); |
- shouldEvaluateToSameObject("entries[0].target", target); |
+ function step0() { |
+ test(function() { assert_equals(entries.length, 0) }, "No notifications after first rAF."); |
+ document.scrollingElement.scrollLeft = 100; |
+ waitForNotification(step1); |
} |
- document.scrollingElement.scrollTop = 800; |
- waitForNotification(step2); |
-} |
-function step2() { |
- shouldBeEqualToNumber("entries.length", 1); |
- document.scrollingElement.scrollTop = 900; |
- waitForNotification(step3); |
-} |
+ function step1() { |
+ checkEntry(0, [912, 1012, 708, 808, 912, 942, 708, 808, -30, 942, -10, 819, target]); |
+ document.scrollingElement.scrollTop = 800; |
+ waitForNotification(step2); |
+ } |
-function step3() { |
- shouldBeEqualToNumber("entries.length", 2); |
- if (entries.length > 1) { |
- shouldBeEqualToNumber("entries[1].boundingClientRect.left", 912); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.right", 1012); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.top", -192); |
- shouldBeEqualToNumber("entries[1].boundingClientRect.bottom", -92); |
- 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", -30); |
- shouldBeEqualToNumber("entries[1].rootBounds.right", 942); |
- shouldBeEqualToNumber("entries[1].rootBounds.top", -10); |
- shouldBeEqualToNumber("entries[1].rootBounds.bottom", 819); |
- shouldEvaluateToSameObject("entries[1].target", target); |
+ function step2() { |
+ checkEntry(0); |
+ document.scrollingElement.scrollTop = 900; |
+ waitForNotification(step3); |
} |
- finishJSTest(); |
- document.scrollingElement.scrollLeft = 0; |
- document.scrollingElement.scrollTop = 0; |
-} |
+ |
+ function step3() { |
+ checkEntry(1, [912, 1012, -192, -92, 0, 0, 0, 0, -30, 942, -10, 819, target]); |
+ document.getElementById("leading-space").style.height = ""; |
+ document.getElementById("trailing-space").style.height = ""; |
+ document.scrollingElement.scrollLeft = 0; |
+ document.scrollingElement.scrollTop = 0; |
+ t.done(); |
+ } |
+}; |
</script> |