Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace node.rootNode with node.getRootNode().

master
Fedor 2020-07-16 03:22:43 +03:00
parent bde541aeec
commit 3251a337f9
9 changed files with 128 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dom/base/nsINode.cpp
View File

@ -107,6 +107,7 @@
#include "GeometryUtils.h" #include "GeometryUtils.h"
#include "nsIAnimationObserver.h" #include "nsIAnimationObserver.h"
#include "nsChildContentList.h" #include "nsChildContentList.h"
#include "mozilla/dom/NodeBinding.h"
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
#include "mozilla/dom/AccessibleNode.h" #include "mozilla/dom/AccessibleNode.h"
@ -250,6 +251,30 @@ nsINode::GetTextEditorRootContent(nsIEditor** aEditor)
return nullptr; return nullptr;
} }
nsINode* nsINode::GetRootNode(const GetRootNodeOptions& aOptions)
{
if (aOptions.mComposed) {
if (IsInComposedDoc() && GetComposedDoc()) {
return OwnerDoc();
}
nsINode* node = this;
ShadowRoot* shadowRootParent = nullptr;
while(node) {
node = node->SubtreeRoot();
shadowRootParent = ShadowRoot::FromNode(node);
if (!shadowRootParent) {
break;
}
node = shadowRootParent->GetHost();
}
return node;
}
return SubtreeRoot();
}
nsINode* nsINode*
nsINode::SubtreeRoot() const nsINode::SubtreeRoot() const
{ {

10
dom/base/nsINode.h
View File

@ -84,6 +84,7 @@ template<typename> class Sequence;
class Text; class Text;
class TextOrElementOrDocument; class TextOrElementOrDocument;
struct DOMPointInit; struct DOMPointInit;
struct GetRootNodeOptions;
} // namespace dom } // namespace dom
} // namespace mozilla } // namespace mozilla
@ -982,10 +983,11 @@ public:
*/ */
nsINode* SubtreeRoot() const; nsINode* SubtreeRoot() const;
nsINode* RootNode() const /*
{ * Get context object's shadow-including root if options's composed is true,
return SubtreeRoot(); * and context object's root otherwise.
} */
nsINode* GetRootNode(const mozilla::dom::GetRootNodeOptions& aOptions);
/** /**
* See nsIDOMEventTarget * See nsIDOMEventTarget

1
dom/tests/mochitest/webcomponents/mochitest.ini
View File

@ -40,3 +40,4 @@ skip-if = true # disabled - See bug 1390396
[test_shadowroot_style_order.html] [test_shadowroot_style_order.html]
[test_style_fallback_content.html] [test_style_fallback_content.html]
[test_link_prefetch.html] [test_link_prefetch.html]
[test_bug1269155.html]

89
dom/tests/mochitest/webcomponents/test_bug1269155.html Normal file
View File

@ -0,0 +1,89 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1269155
-->
<head>
<title>Test for Bug 1269155</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<a target="_blank"
href="https://bugzilla.mozilla.org/show_bug.cgi?id=1269155">Mozilla Bug 1269155</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 1269155 **/
var host = document.querySelector('#content');
var root = host.createShadowRoot();
var header1 = document.createElement('h1');
header1.textContent = 'Shadow Header1';
var paragraph1 = document.createElement('p');
paragraph1.textContent = 'shadow text paragraph1';
root.appendChild(header1);
root.appendChild(paragraph1);
var root2 = paragraph1.createShadowRoot();
var header2 = document.createElement('h2');
header2.textContent = 'Shadow Header2';
var paragraph2 = document.createElement('p');
paragraph2.textContent = 'shadow text paragraph2';
root2.appendChild(header2);
root2.appendChild(paragraph2);
var frag = document.createDocumentFragment();
var paragraph3 = document.createElement('p');
paragraph3.textContent = 'fragment paragraph3';
frag.appendChild(paragraph3);
var root3 = paragraph3.createShadowRoot();
var header4 = document.createElement('h2');
header4.textContent = 'Shadow Header3';
var paragraph4 = document.createElement('p');
paragraph4.textContent = 'shadow text paragraph4';
root3.appendChild(header4);
root3.appendChild(paragraph4);
//shadow dom without compose
is(root.getRootNode(), root, "root.getRootNode() should be root.");
is(root2.getRootNode(), root2, "root2.getRootNode() should be root.");
is(root3.getRootNode(), root3, "root3.getRootNode() should be root.");
is(header1.getRootNode(), root, "header1.getRootNode() should be root.");
is(header2.getRootNode(), root2, "header1.getRootNode() should be root2.");
is(header4.getRootNode(), root3, "header1.getRootNode() should be root3.");
//shadow dom with compose
is(root.getRootNode({ composed: true }), document, "root.getRootNode() with composed flag should be document.");
is(root2.getRootNode({ composed: true }), document, "root2.getRootNode() with composed flag should be document.");
is(root3.getRootNode({ composed: true }), frag, "root3.getRootNode() with composed flag should be frag.");
is(header1.getRootNode({ composed: true }) , document, "header1.getRootNode() with composed flag should be document.");
is(header2.getRootNode({ composed: true }) , document, "header2.getRootNode() with composed flag should be document.");
is(header4.getRootNode({ composed: true }) , frag, "head4.getRootNode() with composed flag should be frag.");
//dom without compose
is(host.getRootNode(), document, "host.getRootNode() should be document.");
is(header1.getRootNode(), root, "header1.getRootNode() should be root.");
is(paragraph1.getRootNode(), root, "paragraph1.getRootNode() should be root.");
is(frag.getRootNode(), frag, "frag.getRootNode() should be frag.");
//dom with compose
is(host.getRootNode({ composed: true }) , document, "host.getRootNode() with composed flag should be document.");
is(header1.getRootNode({ composed: true }) , document, "header1.getRootNode() with composed flag should be document.");
is(paragraph1.getRootNode({ composed: true }) , document, "paragraph1.getRootNode() with composed flag should be document.");
is(frag.getRootNode({ composed: true }) , frag, "frag.getRootNode() with composed flag should be frag.");
</script>
</pre>
</body>
</html>

9
dom/webidl/Node.webidl
View File

@ -38,8 +38,8 @@ interface Node : EventTarget {
readonly attribute boolean isConnected; readonly attribute boolean isConnected;
[Pure] [Pure]
readonly attribute Document? ownerDocument; readonly attribute Document? ownerDocument;
[Pure, Pref="dom.node.rootNode.enabled"] [Pure]
readonly attribute Node rootNode; Node getRootNode(optional GetRootNodeOptions options);
[Pure] [Pure]
readonly attribute Node? parentNode; readonly attribute Node? parentNode;
[Pure] [Pure]
@ -113,3 +113,8 @@ interface Node : EventTarget {
readonly attribute AccessibleNode? accessibleNode; readonly attribute AccessibleNode? accessibleNode;
#endif #endif
}; };
dictionary GetRootNodeOptions {
boolean composed = false;
};

7
modules/libpref/init/all.js
View File

@ -5384,13 +5384,6 @@ pref("layout.css.color-adjust.enabled", true);
pref("dom.audiochannel.audioCompeting", false); pref("dom.audiochannel.audioCompeting", false);
pref("dom.audiochannel.audioCompeting.allAgents", false); pref("dom.audiochannel.audioCompeting.allAgents", false);
// Disable Node.rootNode in release builds.
#ifdef RELEASE_OR_BETA
pref("dom.node.rootNode.enabled", false);
#else
pref("dom.node.rootNode.enabled", true);
#endif
// Default media volume // Default media volume
pref("media.default_volume", "1.0"); pref("media.default_volume", "1.0");

4
testing/web-platform/meta/dom/historical.html.ini
View File

@ -12,7 +12,3 @@
expected: FAIL expected: FAIL
bug: 660660 bug: 660660
[Node member must be nuked: rootNode]
disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1303802
bug: 1269155

57
testing/web-platform/meta/dom/interfaces.html.ini
View File

@ -1,6 +1,5 @@
[interfaces.html] [interfaces.html]
type: testharness type: testharness
prefs: [dom.node.rootNode.enabled:true]
[Document interface: attribute origin] [Document interface: attribute origin]
expected: FAIL expected: FAIL
@ -42,60 +41,4 @@
[Text interface: document.createTextNode("abc") must inherit property "assignedSlot" with the proper type (2)] [Text interface: document.createTextNode("abc") must inherit property "assignedSlot" with the proper type (2)]
expected: FAIL expected: FAIL
[Node interface: operation getRootNode(GetRootNodeOptions)]
expected: FAIL
[Node interface: new Document() must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on new Document() with too few arguments must throw TypeError]
expected: FAIL
[Node interface: xmlDoc must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on xmlDoc with too few arguments must throw TypeError]
expected: FAIL
[Node interface: document.doctype must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on document.doctype with too few arguments must throw TypeError]
expected: FAIL
[Node interface: document.createDocumentFragment() must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on document.createDocumentFragment() with too few arguments must throw TypeError]
expected: FAIL
[Node interface: element must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on element with too few arguments must throw TypeError]
expected: FAIL
[Node interface: document.querySelector("[id\]").attributes[0\] must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on document.querySelector("[id\]").attributes[0\] with too few arguments must throw TypeError]
expected: FAIL
[Node interface: document.createTextNode("abc") must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on document.createTextNode("abc") with too few arguments must throw TypeError]
expected: FAIL
[Node interface: xmlDoc.createProcessingInstruction("abc", "def") must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on xmlDoc.createProcessingInstruction("abc", "def") with too few arguments must throw TypeError]
expected: FAIL
[Node interface: document.createComment("abc") must inherit property "getRootNode" with the proper type (17)]
expected: FAIL
[Node interface: calling getRootNode(GetRootNodeOptions) on document.createComment("abc") with too few arguments must throw TypeError]
expected: FAIL

15
testing/web-platform/meta/dom/nodes/rootNode.html.ini
View File

@ -1,15 +0,0 @@
[rootNode.html]
type: testharness
prefs: [dom.node.rootNode.enabled:true]
[getRootNode() must return the context object when it does not have any parent]
expected: FAIL
[getRootNode() must return the parent node of the context object when the context object has a single ancestor not in a document]
expected: FAIL
[getRootNode() must return the document when a node is in document]
expected: FAIL
[getRootNode() must return a document fragment when a node is in the fragment]
expected: FAIL