Diff
Modified: trunk/LayoutTests/ChangeLog (202633 => 202634)
--- trunk/LayoutTests/ChangeLog 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/LayoutTests/ChangeLog 2016-06-29 18:36:29 UTC (rev 202634)
@@ -1,3 +1,14 @@
+2016-06-29 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Show Shadow Root type in DOM Tree
+ https://bugs.webkit.org/show_bug.cgi?id=159236
+ <rdar://problem/27068521>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/dom/shadowRootType-expected.txt: Added.
+ * inspector/dom/shadowRootType.html: Added.
+
2016-06-29 Benjamin Poulain <[email protected]>
[JSC] Fix small issues of TypedArray prototype
Added: trunk/LayoutTests/inspector/dom/shadowRootType-expected.txt (0 => 202634)
--- trunk/LayoutTests/inspector/dom/shadowRootType-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/dom/shadowRootType-expected.txt 2016-06-29 18:36:29 UTC (rev 202634)
@@ -0,0 +1,20 @@
+Test for DOMNode.shadowRootType.
+
+
+== Running test suite: DOMNode.shadowRootType
+-- Running test case: ShadowRootType.UserAgent
+PASS: DOMNode has a single shadow root.
+PASS: DOMNode has UserAgent shadow root type.
+
+-- Running test case: ShadowRootType.Closed
+PASS: DOMNode has a single shadow root.
+PASS: DOMNode has Closed shadow root type.
+
+-- Running test case: ShadowRootType.Open
+PASS: DOMNode has a single shadow root.
+PASS: DOMNode has Open shadow root type.
+
+-- Running test case: NoShadowRootType
+PASS: DOMNode has no shadow roots.
+PASS: DOMNode has no shadow root type.
+
Added: trunk/LayoutTests/inspector/dom/shadowRootType.html (0 => 202634)
--- trunk/LayoutTests/inspector/dom/shadowRootType.html (rev 0)
+++ trunk/LayoutTests/inspector/dom/shadowRootType.html 2016-06-29 18:36:29 UTC (rev 202634)
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src=""
+<script>
+function test()
+{
+ let documentNode;
+
+ let suite = InspectorTest.createAsyncSuite("DOMNode.shadowRootType");
+
+ suite.addTestCase({
+ name: "ShadowRootType.UserAgent",
+ test: (resolve, reject) => {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#host-user-agent", (nodeId) => {
+ let domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.assert(domNode, "Got DOMNode for #host-user-agent");
+ InspectorTest.expectThat(domNode.shadowRoots().length === 1, "DOMNode has a single shadow root.");
+ InspectorTest.expectThat(domNode.shadowRoots()[0].shadowRootType() === WebInspector.DOMNode.ShadowRootType.UserAgent, "DOMNode has UserAgent shadow root type.");
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "ShadowRootType.Closed",
+ test: (resolve, reject) => {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#host-closed", (nodeId) => {
+ let domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.assert(domNode, "Got DOMNode for #host-closed");
+ InspectorTest.expectThat(domNode.shadowRoots().length === 1, "DOMNode has a single shadow root.");
+ InspectorTest.expectThat(domNode.shadowRoots()[0].shadowRootType() === WebInspector.DOMNode.ShadowRootType.Closed, "DOMNode has Closed shadow root type.");
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "ShadowRootType.Open",
+ test: (resolve, reject) => {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#host-open", (nodeId) => {
+ let domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.assert(domNode, "Got DOMNode for #host-open");
+ InspectorTest.expectThat(domNode.shadowRoots().length === 1, "DOMNode has a single shadow root.");
+ InspectorTest.expectThat(domNode.shadowRoots()[0].shadowRootType() === WebInspector.DOMNode.ShadowRootType.Open, "DOMNode has Open shadow root type.");
+ resolve();
+ });
+ }
+ });
+
+ suite.addTestCase({
+ name: "NoShadowRootType",
+ test: (resolve, reject) => {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#no-host", (nodeId) => {
+ let domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.assert(domNode, "Got DOMNode for #no-host");
+ InspectorTest.expectThat(domNode.shadowRoots().length === 0, "DOMNode has no shadow roots.");
+ InspectorTest.expectThat(domNode.shadowRootType() === undefined, "DOMNode has no shadow root type.");
+ resolve();
+ });
+ }
+ });
+
+ WebInspector.domTreeManager.requestDocument((node) => {
+ documentNode = node;
+ suite.runTestCasesAndFinish();
+ });
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Test for DOMNode.shadowRootType.</p>
+<div style="display: none">
+ <input id="host-user-agent" controls>
+ <div id="host-closed"></div>
+ <div id="host-open"></div>
+ <div id="no-host"></div>
+</div>
+<script>
+(function() {
+ var shadowRootClosed = document.getElementById("host-closed").attachShadow({mode: "closed"});
+ shadowRootClosed.appendChild(document.createTextNode("closed"));
+
+ var shadowRootOpen = document.getElementById("host-open").attachShadow({mode: "open"});
+ shadowRootOpen.appendChild(document.createTextNode("open"));
+})();
+</script>
+</body>
+</html>
Modified: trunk/Source/_javascript_Core/ChangeLog (202633 => 202634)
--- trunk/Source/_javascript_Core/ChangeLog 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-06-29 18:36:29 UTC (rev 202634)
@@ -1,3 +1,14 @@
+2016-06-29 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Show Shadow Root type in DOM Tree
+ https://bugs.webkit.org/show_bug.cgi?id=159236
+ <rdar://problem/27068521>
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/DOM.json:
+ Include optional shadowRootType property for DOMNodes.
+
2016-06-29 Commit Queue <[email protected]>
Unreviewed, rolling out r202627.
Modified: trunk/Source/_javascript_Core/inspector/protocol/DOM.json (202633 => 202634)
--- trunk/Source/_javascript_Core/inspector/protocol/DOM.json 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/_javascript_Core/inspector/protocol/DOM.json 2016-06-29 18:36:29 UTC (rev 202634)
@@ -20,6 +20,12 @@
"description": "Pseudo element type."
},
{
+ "id": "ShadowRootType",
+ "type": "string",
+ "enum": ["user-agent", "open", "closed"],
+ "description": "Shadow root type."
+ },
+ {
"id": "LiveRegionRelevant",
"type": "string",
"enum": ["additions", "removals", "text"],
@@ -46,6 +52,7 @@
{ "name": "name", "type": "string", "optional": true, "description": "<code>Attr</code>'s name." },
{ "name": "value", "type": "string", "optional": true, "description": "<code>Attr</code>'s value." },
{ "name": "pseudoType", "$ref": "PseudoType", "optional": true, "description": "Pseudo element type for this node." },
+ { "name": "shadowRootType", "$ref": "ShadowRootType", "optional": true, "description": "Shadow root type." },
{ "name": "frameId", "$ref": "Network.FrameId", "optional": true, "description": "Frame ID for frame owner elements." },
{ "name": "contentDocument", "$ref": "Node", "optional": true, "description": "Content document for frame owner elements." },
{ "name": "shadowRoots", "type": "array", "optional": true, "items": { "$ref": "Node" }, "description": "Shadow root list for given element host." },
Modified: trunk/Source/WebCore/ChangeLog (202633 => 202634)
--- trunk/Source/WebCore/ChangeLog 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 18:36:29 UTC (rev 202634)
@@ -1,3 +1,18 @@
+2016-06-29 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Show Shadow Root type in DOM Tree
+ https://bugs.webkit.org/show_bug.cgi?id=159236
+ <rdar://problem/27068521>
+
+ Reviewed by Timothy Hatcher.
+
+ Test: inspector/dom/shadowRootType.html
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::shadowRootType):
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ Set the shadowRootType property when a node is a ShadowRoot.
+
2016-06-29 Jeremy Jones <[email protected]>
Replace MPAudioVideoRoutingActionSheet with MPAVRoutingSheet.
Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (202633 => 202634)
--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-06-29 18:36:29 UTC (rev 202634)
@@ -1280,6 +1280,21 @@
}
}
+static Inspector::Protocol::DOM::ShadowRootType shadowRootType(ShadowRoot::Type type)
+{
+ switch (type) {
+ case ShadowRoot::Type::UserAgent:
+ return Inspector::Protocol::DOM::ShadowRootType::UserAgent;
+ case ShadowRoot::Type::Closed:
+ return Inspector::Protocol::DOM::ShadowRootType::Closed;
+ case ShadowRoot::Type::Open:
+ return Inspector::Protocol::DOM::ShadowRootType::Open;
+ }
+
+ ASSERT_NOT_REACHED();
+ return Inspector::Protocol::DOM::ShadowRootType::UserAgent;
+}
+
static String computeContentSecurityPolicySHA256Hash(const Element& element)
{
// FIXME: Compute the digest with respect to the raw bytes received from the page.
@@ -1391,6 +1406,9 @@
Attr& attribute = downcast<Attr>(*node);
value->setName(attribute.name());
value->setValue(attribute.value());
+ } else if (is<ShadowRoot>(*node)) {
+ ShadowRoot& shadowRoot = downcast<ShadowRoot>(*node);
+ value->setShadowRootType(shadowRootType(shadowRoot.type()));
}
// Need to enable AX to get the computed role.
Modified: trunk/Source/WebInspectorUI/ChangeLog (202633 => 202634)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-29 18:36:29 UTC (rev 202634)
@@ -1,3 +1,33 @@
+2016-06-29 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Show Shadow Root type in DOM Tree
+ https://bugs.webkit.org/show_bug.cgi?id=159236
+ <rdar://problem/27068521>
+
+ Reviewed by Timothy Hatcher.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ "Shadow Content (type)" string.
+
+ * UserInterface/Models/DOMNode.js:
+ (WebInspector.DOMNode):
+ (WebInspector.DOMNode.prototype.shadowRoots):
+ (WebInspector.DOMNode.prototype.shadowRootType):
+ Initialize state and add accessors.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.shadowRootTypeDisplayName):
+ (WebInspector.DOMTreeElement.prototype._nodeTitleInfo):
+ Better string when an element is a Shadow Root.
+
+ * UserInterface/Views/DOMTreeElementPathComponent.js:
+ (WebInspector.DOMTreeElementPathComponent):
+ Better to check the Shadow Root type.
+
+ * UserInterface/Views/DOMTreeOutline.css:
+ (.tree-outline.dom .html-fragment.shadow):
+ Opacity looks poor when there is a selection. Switch to gray.
+
2016-06-28 Nikita Vasilyev <[email protected]>
REGRESSION (r188730): Web Inspector: Warning icons incorrectly positioned in CSS Rules sidebar
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (202633 => 202634)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-06-29 18:36:29 UTC (rev 202634)
@@ -159,6 +159,7 @@
localizedStrings["Close Other Tabs"] = "Close Other Tabs";
localizedStrings["Close Tab"] = "Close Tab";
localizedStrings["Close resource view"] = "Close resource view";
+localizedStrings["Closed"] = "Closed";
localizedStrings["Closure Variables"] = "Closure Variables";
localizedStrings["Closure Variables (%s)"] = "Closure Variables (%s)";
localizedStrings["Code"] = "Code";
@@ -497,6 +498,7 @@
localizedStrings["Online"] = "Online";
localizedStrings["Only show resources with issues"] = "Only show resources with issues";
localizedStrings["Opacity"] = "Opacity";
+localizedStrings["Open"] = "Open";
localizedStrings["Option-click to show all units"] = "Option-click to show all units";
localizedStrings["Option-click to show all values"] = "Option-click to show all values";
localizedStrings["Option-click to show source"] = "Option-click to show source";
@@ -621,6 +623,7 @@
localizedStrings["Settings"] = "Settings";
localizedStrings["Shadow"] = "Shadow";
localizedStrings["Shadow Content"] = "Shadow Content";
+localizedStrings["Shadow Content (%s)"] = "Shadow Content (%s)";
localizedStrings["Shared Focus"] = "Shared Focus";
localizedStrings["Shortest property path to %s"] = "Shortest property path to %s";
localizedStrings["Show %d More"] = "Show %d More";
@@ -733,6 +736,7 @@
localizedStrings["Uncomment All Properties"] = "Uncomment All Properties";
localizedStrings["Unknown node"] = "Unknown node";
localizedStrings["Untitled"] = "Untitled";
+localizedStrings["User Agent"] = "User Agent";
localizedStrings["User Agent Stylesheet"] = "User Agent Stylesheet";
localizedStrings["User Stylesheet"] = "User Stylesheet";
localizedStrings["Using Keyword Value"] = "Using Keyword Value";
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (202633 => 202634)
--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-06-29 18:36:29 UTC (rev 202634)
@@ -47,6 +47,7 @@
this._localName = payload.localName;
this._nodeValue = payload.nodeValue;
this._pseudoType = payload.pseudoType;
+ this._shadowRootType = payload.shadowRootType;
this._computedRole = payload.role;
this._contentSecurityPolicyHash = payload.contentSecurityPolicyHash;
@@ -318,6 +319,16 @@
return this._pseudoElements.get(WebInspector.DOMNode.PseudoElementType.After) || null;
}
+ shadowRoots()
+ {
+ return this._shadowRoots;
+ }
+
+ shadowRootType()
+ {
+ return this._shadowRootType;
+ }
+
nodeValue()
{
return this._nodeValue;
@@ -678,3 +689,9 @@
Before: "before",
After: "after",
};
+
+WebInspector.DOMNode.ShadowRootType = {
+ UserAgent: "user-agent",
+ Closed: "closed",
+ Open: "open",
+};
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (202633 => 202634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2016-06-29 18:36:29 UTC (rev 202634)
@@ -48,6 +48,22 @@
node.addEventListener(WebInspector.DOMNode.Event.EnabledPseudoClassesChanged, this._nodePseudoClassesDidChange, this);
}
+ // Static
+
+ static shadowRootTypeDisplayName(type)
+ {
+ switch (type) {
+ case WebInspector.DOMNode.ShadowRootType.UserAgent:
+ return WebInspector.UIString("User Agent");
+ case WebInspector.DOMNode.ShadowRootType.Open:
+ return WebInspector.UIString("Open");
+ case WebInspector.DOMNode.ShadowRootType.Closed:
+ return WebInspector.UIString("Closed");
+ }
+ }
+
+ // Public
+
isCloseTag()
{
return this._elementCloseTag;
@@ -1195,8 +1211,8 @@
switch (node.nodeType()) {
case Node.DOCUMENT_FRAGMENT_NODE:
var fragmentElement = info.titleDOM.createChild("span", "html-fragment");
- if (node.isInShadowTree()) {
- fragmentElement.textContent = WebInspector.UIString("Shadow Content");
+ if (node.shadowRootType()) {
+ fragmentElement.textContent = WebInspector.UIString("Shadow Content (%s)").format(WebInspector.DOMTreeElement.shadowRootTypeDisplayName(node.shadowRootType()));
fragmentElement.classList.add("shadow");
} else if (node.parentNode && node.parentNode.templateContent() === node)
fragmentElement.textContent = WebInspector.UIString("Template Content");
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js (202633 => 202634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js 2016-06-29 18:36:29 UTC (rev 202634)
@@ -72,7 +72,7 @@
// FIXME: At some point we might want a different icon for this.
// <rdar://problem/12800950> Need icon for DOCUMENT_FRAGMENT_NODE and PROCESSING_INSTRUCTION_NODE
className = WebInspector.DOMTreeElementPathComponent.DOMDocumentTypeIconStyleClassName;
- if (node.isInShadowTree())
+ if (node.shadowRootType())
title = WebInspector.UIString("Shadow Content");
else
title = WebInspector.displayNameForNode(node);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css (202633 => 202634)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css 2016-06-29 18:25:40 UTC (rev 202633)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.css 2016-06-29 18:36:29 UTC (rev 202634)
@@ -187,7 +187,7 @@
}
.tree-outline.dom .html-fragment.shadow {
- opacity: 0.6;
+ color: gray;
}
.showing-find-banner .tree-outline.dom .search-highlight {