Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1652155 - Fix document check in Document::TopLayerPop. r=edgar

Browse Source 
Top layer / fullscreen should work in shadow dom. This check is off
compared to literally every other fullscreen check.

The test is pretty gross, but not my fault, see the comment in there :)

Differential Revision: https://phabricator.services.mozilla.com/D83198
This commit is contained in:
Emilio Cobos Álvarez 2020-07-12 16:49:10 +00:00
parent 7e3e095b25
commit 667c41d502
2 changed files with 73 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/Document.cpp
View File

@ -13517,10 +13517,12 @@ Element* Document::TopLayerPop(FunctionRef<bool(Element*)> aPredicateFunc) {
// Pop from the stack null elements (references to elements which have
// been GC'd since they were added to the stack) and elements which are
// no longer in this document.
//
// FIXME(emilio): If this loop does something, it'd violate the assertions
// from GetTopLayerTop()... What gives?
while (!mTopLayer.IsEmpty()) {
Element* element = GetTopLayerTop();
if (!element || !element->IsInUncomposedDoc() ||
element->OwnerDoc() != this) {
if (!element || element->GetComposedDoc() != this) {
mTopLayer.RemoveLastElement();
} else {
// The top element of the stack is now an in-doc element. Return here.

69
testing/web-platform/tests/fullscreen/api/document-exit-fullscreen-nested-shadow-dom.html Normal file
View File

@ -0,0 +1,69 @@
<!doctype html>
<title>Exiting fullscreen from a nested shadow root should work correctly.</title>
<link rel="author" title="Mozilla" href="https://mozilla.org">
<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1652155">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="/resources/testdriver.js"></script>
<script src="/resources/testdriver-vendor.js"></script>
<div id="host">
<button>
<!--
This is gross, but testdriver doesn't let us click stuff in shadow
DOM, so here we are instead, using nested slots.
-->
fullscreen
</button>
</div>
<script>
promise_test(async function() {
let host = document.getElementById("host");
host.attachShadow({ mode: "open" }).innerHTML = `
<style>
#outer { width: 200px; height: 200px; background: blue }
</style>
<div id="outer">
<slot></slot>
</div>
`;
let outer = host.shadowRoot.getElementById("outer");
outer.attachShadow({ mode: "open" }).innerHTML = `
<style>
#inner { width: 100px; height: 100px; background: purple }
</style>
<div id="inner"></div>
<slot></slot>
`;
let button = document.querySelector("button");
let inner = outer.shadowRoot.getElementById("inner");
let finished = new Promise(resolve => {
button.addEventListener("click", async function() {
await outer.requestFullscreen();
assert_equals(outer.getRootNode().fullscreenElement, outer);
assert_equals(document.fullscreenElement, host);
button.addEventListener("click", async function() {
await inner.requestFullscreen();
assert_equals(inner.getRootNode().fullscreenElement, inner);
assert_equals(document.fullscreenElement, host);
await document.exitFullscreen();
assert_equals(inner.getRootNode().fullscreenElement, null);
assert_equals(outer.getRootNode().fullscreenElement, outer);
assert_equals(document.fullscreenElement, host);
resolve();
}, { once: true });
requestAnimationFrame(() => requestAnimationFrame(() => {
test_driver.click(button);
}));
}, { once: true });
});
test_driver.click(button);
await finished;
}, "Exiting fullscreen from a nested shadow root works correctly.");
</script>