Skip to content

GitLab

T
tangled
Commit 55698904 authored by Stefan Zager's avatar Stefan Zager Committed by Chromium LUCI CQ
Browse files
Options

[IntersectionObserver] Don't allow cross-document explicit root 

This fixes an bug with the recently-added feature to allow an
observer's explicit root to be a document. In such cases, if a target
element is not in the root document, it should be reported as
"not intersecting".

Change-Id: Iea6bc2444fc5b2bf2dca50cf242d46324a502dbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583217
Commit-Queue: Stefan Zager <szager@chromium.org>
Auto-Submit: Stefan Zager <szager@chromium.org>
Reviewed-by: default avatarChris Harrelson <chrishtr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835786}
parent 60965766
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 4 deletions
third_party/blink/renderer/core/intersection_observer/intersection_geometry.cc
View file @ 55698904
...@@ -224,10 +224,10 @@ const LayoutObject* IntersectionGeometry::GetRootLayoutObjectForTarget( ...@@ -224,10 +224,10 @@ const LayoutObject* IntersectionGeometry::GetRootLayoutObjectForTarget(
root = To<Document>(root_node)->GetLayoutView(); root = To<Document>(root_node)->GetLayoutView();
} else { } else {
root = root_node->GetLayoutObject(); root = root_node->GetLayoutObject();
if (target && check_containing_block_chain && }
!IsContainingBlockChainDescendant(target, root)) { if (target && check_containing_block_chain &&
root = nullptr; !IsContainingBlockChainDescendant(target, root)) {
} root = nullptr;
} }
return root; return root;
} }
......
third_party/blink/web_tests/external/wpt/intersection-observer/cross-document-root.html 0 → 100644
View file @ 55698904
<!DOCTYPE html>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="author" href="mailto:szager@chromium.org" title="Stefan Zager">
<link rel="help" href="https://w3c.github.io/IntersectionObserver/#update-intersection-observations-algo">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="./resources/intersection-observer-test-utils.js"></script>
<style>
pre, #log {
position: absolute;
top: 0;
left: 200px;
}
iframe {
height: 250px;
width: 150px;
border: 0;
}
</style>
<iframe id="target-iframe" src="resources/iframe-no-root-subframe.html"></iframe>
<script>
var iframe = document.getElementById("target-iframe");
var target;
var root;
var entries = [];
iframe.onload = function() {
runTestCycle(function() {
assert_true(!!iframe, "iframe exists");
target = iframe.contentDocument.getElementById("target");
assert_true(!!target, "Target element exists.");
var observer = new IntersectionObserver(function(changes) {
entries = entries.concat(changes)
}, { root: document });
observer.observe(target);
entries = entries.concat(observer.takeRecords());
assert_equals(entries.length, 0, "No initial notifications.");
runTestCycle(step0, "First rAF.");
}, "Observer with explicit root which is the document, observing a target in a same-origin iframe.");
};
function step0() {
checkLastEntry(entries, 0, [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false]);
}
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment