mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-05 15:28:39 +09:00
Bug 1346623 - Allow anonymous content created with nsIDocument::InsertAnonymousContent can change from non-native to native AC
* Prevent canvas custom content from becoming NAC when reframing the root element * Add an API to get computed style values through an AnonymousContent object Tag #1375
This commit is contained in:
parent
5a9d76e6d5
commit
fda213de85
6 changed files with 120 additions and 4 deletions
|
|
@ -4192,13 +4192,28 @@ nsCSSFrameConstructor::GetAnonymousContent(nsIContent* aParent,
|
|||
|
||||
ConnectAnonymousTreeDescendants(content, aContent[i].mChildren);
|
||||
|
||||
// least-surprise CSS binding until we do the SVG specified
|
||||
// cascading rules for <svg:use> - bug 265894
|
||||
if (aParentFrame->GetType() == nsGkAtoms::svgUseFrame) {
|
||||
nsIAtom* parentFrameType = aParentFrame->GetType();
|
||||
if (parentFrameType == nsGkAtoms::svgUseFrame) {
|
||||
// least-surprise CSS binding until we do the SVG specified
|
||||
// cascading rules for <svg:use> - bug 265894
|
||||
content->SetFlags(NODE_IS_ANONYMOUS_ROOT);
|
||||
} else {
|
||||
content->SetIsNativeAnonymousRoot();
|
||||
SetNativeAnonymousBitOnDescendants(content);
|
||||
// Don't mark descendants of the custom content container
|
||||
// as native anonymous. When canvas custom content is initially
|
||||
// created and appended to the custom content container, in
|
||||
// nsIDocument::InsertAnonymousContent, it is not considered native
|
||||
// anonymous content. But if we end up reframing the root element,
|
||||
// we will re-create the nsCanvasFrame, and we would end up in here,
|
||||
// marking it as NAC. Existing uses of canvas custom content would
|
||||
// break if it becomes NAC (since each element starts inheriting
|
||||
// styles from its closest non-NAC ancestor, rather than from its
|
||||
// parent).
|
||||
if (!(parentFrameType == nsGkAtoms::canvasFrame &&
|
||||
content == static_cast<nsCanvasFrame*>(aParentFrame)
|
||||
->GetCustomContentContainer())) {
|
||||
SetNativeAnonymousBitOnDescendants(content);
|
||||
}
|
||||
}
|
||||
|
||||
bool anonContentIsEditable = content->HasFlag(NODE_IS_EDITABLE);
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ support-files =
|
|||
mismatch.png
|
||||
|
||||
[test_author_specified_style.html]
|
||||
[test_bug1346623.html]
|
||||
[test_bug418986-2.xul]
|
||||
[test_bug1157097.html]
|
||||
[test_bug1160724.xul]
|
||||
|
|
|
|||
60
layout/style/test/chrome/test_bug1346623.html
Normal file
60
layout/style/test/chrome/test_bug1346623.html
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<head>
|
||||
<title>Test for bug 1346623</title>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
|
||||
</head>
|
||||
<body onload="startTest();">
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1346623">Mozilla Bug 1346623</a>
|
||||
<div id="display">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
var Ci = Components.interfaces;
|
||||
var winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils);
|
||||
|
||||
function startTest() {
|
||||
// load some styles at the agent level
|
||||
var css = `
|
||||
#ac-parent { color: green; }
|
||||
#ac-child.abc { }
|
||||
`;
|
||||
var sheetURL = "data:text/css," + encodeURIComponent(css);
|
||||
winUtils.loadSheetUsingURIString(sheetURL, winUtils.AGENT_SHEET);
|
||||
|
||||
// add canvas anonymous content
|
||||
var bq = document.createElement("blockquote");
|
||||
bq.id = "ac-parent";
|
||||
bq.textContent = "This blockquote text should be green.";
|
||||
var div = document.createElement("div");
|
||||
div.id = "ac-child";
|
||||
div.textContent = " This div text should be green.";
|
||||
bq.appendChild(div);
|
||||
var ac = document.insertAnonymousContent(bq);
|
||||
document.body.offsetWidth;
|
||||
|
||||
is(ac.getComputedStylePropertyValue("ac-child", "color"), "rgb(0, 128, 0)",
|
||||
"color before reframing");
|
||||
|
||||
// reframe the root
|
||||
document.documentElement.style.display = "flex";
|
||||
document.body.offsetWidth;
|
||||
|
||||
// restyle the div
|
||||
ac.setAttributeForElement("ac-child", "class", "abc");
|
||||
document.body.offsetWidth;
|
||||
|
||||
is(ac.getComputedStylePropertyValue("ac-child", "color"), "rgb(0, 128, 0)",
|
||||
"color after reframing");
|
||||
SimpleTest.finish();
|
||||
}
|
||||
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Add table
Add a link
Reference in a new issue