Chromium Code Reviews| Index: third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
| diff --git a/third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html b/third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
| similarity index 60% |
| copy from third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html |
| copy to third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
| index b3552a3b5cf641561d52ff3df664c18b774f17b5..57d49244cab43fa699f55561dfe72650d7faa060 100644 |
| --- a/third_party/WebKit/LayoutTests/intersection-observer/iframe-no-root.html |
| +++ b/third_party/WebKit/LayoutTests/intersection-observer/root-margin.html |
| @@ -2,23 +2,25 @@ |
| <script src="../resources/js-test.js"></script> |
| <script src="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="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> |
| <script> |
| -description("Simple intersection observer test with no explicit root and target in an iframe."); |
| -var entries = []; |
| -var targetIframe = document.getElementById("target-iframe"); |
| - |
| -targetIframe.onload = function() { |
| - var target = targetIframe.contentDocument.getElementById("target"); |
| - var iframeScroller = targetIframe.contentDocument.scrollingElement; |
| + description("Intersection observer test with root margin and implicit root."); |
| + 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, {}); |
| + var observer = new IntersectionObserver(observer_callback, { |
| + rootMargin: "10px 20% 40% 30px" |
|
ojan
2016/01/12 01:08:49
Please add test coverage for the other parsing cod
szager1
2016/01/12 19:24:43
I added tests to demonstrate that the parsing work
|
| + }); |
| observer.observe(target); |
| // TODO(szager): It shouldn't be necessary to RAF after the call to observer() |
| @@ -27,15 +29,28 @@ targetIframe.onload = function() { |
| function step0() { |
| setTimeout(function() { |
| shouldBeEqualToNumber("entries.length", 0); |
| - document.scrollingElement.scrollTop = 200; |
| + document.scrollingElement.scrollLeft = 100; |
| requestAnimationFrame(step1); |
| }); |
| } |
| function step1() { |
| setTimeout(function() { |
| - shouldBeEqualToNumber("entries.length", 0); |
| - iframeScroller.scrollTop = 250; |
| + 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); |
| + document.scrollingElement.scrollTop = 800; |
| requestAnimationFrame(step2); |
| }); |
| } |
| @@ -43,20 +58,7 @@ targetIframe.onload = function() { |
| function step2() { |
| setTimeout(function() { |
| shouldBeEqualToNumber("entries.length", 1); |
| - shouldBeEqualToNumber("entries[0].boundingClientRect.left", 18); |
| - shouldBeEqualToNumber("entries[0].boundingClientRect.right", 118); |
| - shouldBeEqualToNumber("entries[0].boundingClientRect.top", 468); |
| - shouldBeEqualToNumber("entries[0].boundingClientRect.bottom", 568); |
| - shouldBeEqualToNumber("entries[0].intersectionRect.left", 18); |
| - shouldBeEqualToNumber("entries[0].intersectionRect.right", 118); |
| - shouldBeEqualToNumber("entries[0].intersectionRect.top", 510); |
| - shouldBeEqualToNumber("entries[0].intersectionRect.bottom", 568); |
| - 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; |
| + document.scrollingElement.scrollTop = 900; |
| requestAnimationFrame(step3); |
| }); |
| } |
| @@ -64,24 +66,24 @@ targetIframe.onload = function() { |
| function step3() { |
| setTimeout(function() { |
| shouldBeEqualToNumber("entries.length", 2); |
| - shouldBeEqualToNumber("entries[1].boundingClientRect.left", 18); |
| - shouldBeEqualToNumber("entries[1].boundingClientRect.right", 118); |
| - shouldBeEqualToNumber("entries[1].boundingClientRect.top", 568); |
| - shouldBeEqualToNumber("entries[1].boundingClientRect.bottom", 668); |
| + 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", 0); |
| - shouldBeEqualToNumber("entries[1].rootBounds.right", 785); |
| - shouldBeEqualToNumber("entries[1].rootBounds.top", 0); |
| - shouldBeEqualToNumber("entries[1].rootBounds.bottom", 600); |
| + 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); |
| finishTest(); |
| + document.scrollingElement.scrollLeft = 0; |
| document.scrollingElement.scrollTop = 0; |
| }); |
| } |
| requestAnimationFrame(step0); |
| -} |
| </script> |