<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200539] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200539">200539</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-06 22:52:01 -0700 (Fri, 06 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Inspect Element and Element Selection searching should work with Shadow DOM Nodes
https://bugs.webkit.org/show_bug.cgi?id=157446
<rdar://problem/24688447>
Reviewed by Ryosuke Niwa.
Source/WebCore:
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::innerParentNode):
The Inspector backend was informing the frontend that all ShadowRoots
were floating and had no parent. Get the host element for ShadowRoots.
* rendering/HitTestResult.cpp:
(WebCore::moveOutOfUserAgentShadowTree):
(WebCore::HitTestResult::setToNonShadowAncestor):
EventHandler::mouseMoved is calling setToNonShadowAncestor before
notifying Page::chrome / Inspector about the moused over element.
This should be the deepest non-user-agent-shadow node.
Source/WebInspectorUI:
* UserInterface/Models/DOMNode.js:
(WebInspector.DOMNode):
Shadow DOM nodes did not have a parent, and so when attempting
to create DOM Tree elements up the chain, we were failing at
shadow boundaries. Create the parent relationship, the parent
already treats it as a child.
* UserInterface/Views/DOMTreeOutline.js:
(WebInspector.DOMTreeOutline.prototype._revealAndSelectNode):
Whenever we try to reveal and select an element in a shadow tree
but the setting to show shadow DOM is disabled, walk up until
we are out of the shadow tree.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingHitTestResultcpp">trunk/Source/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200538 => 200539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-07 05:44:40 UTC (rev 200538)
+++ trunk/Source/WebCore/ChangeLog 2016-05-07 05:52:01 UTC (rev 200539)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Inspect Element and Element Selection searching should work with Shadow DOM Nodes
+ https://bugs.webkit.org/show_bug.cgi?id=157446
+ <rdar://problem/24688447>
+
+ Reviewed by Ryosuke Niwa.
+
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::innerParentNode):
+ The Inspector backend was informing the frontend that all ShadowRoots
+ were floating and had no parent. Get the host element for ShadowRoots.
+
+ * rendering/HitTestResult.cpp:
+ (WebCore::moveOutOfUserAgentShadowTree):
+ (WebCore::HitTestResult::setToNonShadowAncestor):
+ EventHandler::mouseMoved is calling setToNonShadowAncestor before
+ notifying Page::chrome / Inspector about the moused over element.
+ This should be the deepest non-user-agent-shadow node.
+
+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Misc CommandLineAPI cleanup
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157450
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (200538 => 200539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-05-07 05:44:40 UTC (rev 200538)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2016-05-07 05:52:01 UTC (rev 200539)
</span><span class="lines">@@ -1850,6 +1850,8 @@
</span><span class="cx"> ASSERT(node);
</span><span class="cx"> if (is<Document>(*node))
</span><span class="cx"> return downcast<Document>(*node).ownerElement();
</span><ins>+ if (is<ShadowRoot>(*node))
+ return downcast<ShadowRoot>(*node).host();
</ins><span class="cx"> return node->parentNode();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/HitTestResult.cpp (200538 => 200539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-05-07 05:44:40 UTC (rev 200538)
+++ trunk/Source/WebCore/rendering/HitTestResult.cpp 2016-05-07 05:52:01 UTC (rev 200539)
</span><span class="lines">@@ -121,16 +121,27 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Node* moveOutOfUserAgentShadowTree(Node& node)
+{
+ if (node.isInShadowTree()) {
+ if (ShadowRoot* root = node.containingShadowRoot()) {
+ if (root->type() == ShadowRoot::Type::UserAgent)
+ return root->host();
+ }
+ }
+ return &node;
+}
+
</ins><span class="cx"> void HitTestResult::setToNonShadowAncestor()
</span><span class="cx"> {
</span><del>- Node* node = innerNode();
- if (node)
- node = node->document().ancestorInThisScope(node);
- setInnerNode(node);
- node = innerNonSharedNode();
- if (node)
- node = node->document().ancestorInThisScope(node);
- setInnerNonSharedNode(node);
</del><ins>+ if (Node* node = innerNode()) {
+ node = moveOutOfUserAgentShadowTree(*node);
+ setInnerNode(node);
+ }
+ if (Node *node = innerNonSharedNode()) {
+ node = moveOutOfUserAgentShadowTree(*node);
+ setInnerNonSharedNode(node);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HitTestResult::setInnerNode(Node* node)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (200538 => 200539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-07 05:44:40 UTC (rev 200538)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-07 05:52:01 UTC (rev 200539)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Inspect Element and Element Selection searching should work with Shadow DOM Nodes
+ https://bugs.webkit.org/show_bug.cgi?id=157446
+ <rdar://problem/24688447>
+
+ Reviewed by Ryosuke Niwa.
+
+ * UserInterface/Models/DOMNode.js:
+ (WebInspector.DOMNode):
+ Shadow DOM nodes did not have a parent, and so when attempting
+ to create DOM Tree elements up the chain, we were failing at
+ shadow boundaries. Create the parent relationship, the parent
+ already treats it as a child.
+
+ * UserInterface/Views/DOMTreeOutline.js:
+ (WebInspector.DOMTreeOutline.prototype._revealAndSelectNode):
+ Whenever we try to reveal and select an element in a shadow tree
+ but the setting to show shadow DOM is disabled, walk up until
+ we are out of the shadow tree.
+
</ins><span class="cx"> 2016-05-06 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Unexpected white border at the bottom of Debugger filter bar
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (200538 => 200539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-05-07 05:44:40 UTC (rev 200538)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-05-07 05:52:01 UTC (rev 200539)
</span><span class="lines">@@ -71,11 +71,13 @@
</span><span class="cx">
</span><span class="cx"> this._enabledPseudoClasses = [];
</span><span class="cx">
</span><ins>+ // FIXME: The logic around this._shadowRoots and this._children is very confusing.
</ins><span class="cx"> this._shadowRoots = [];
</span><span class="cx"> if (payload.shadowRoots) {
</span><span class="cx"> for (var i = 0; i < payload.shadowRoots.length; ++i) {
</span><span class="cx"> var root = payload.shadowRoots[i];
</span><span class="cx"> var node = new WebInspector.DOMNode(this._domTreeManager, this.ownerDocument, true, root);
</span><ins>+ node.parentNode = this;
</ins><span class="cx"> this._shadowRoots.push(node);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -87,6 +89,8 @@
</span><span class="cx">
</span><span class="cx"> if (payload.children)
</span><span class="cx"> this._setChildrenPayload(payload.children);
</span><ins>+ else if (!this._children && this._shadowRoots.length)
+ this._children = this._shadowRoots.slice();
</ins><span class="cx">
</span><span class="cx"> this._pseudoElements = new Map;
</span><span class="cx"> if (payload.pseudoElements) {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeOutlinejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js (200538 => 200539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2016-05-07 05:44:40 UTC (rev 200538)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeOutline.js 2016-05-07 05:52:01 UTC (rev 200539)
</span><span class="lines">@@ -282,6 +282,13 @@
</span><span class="cx"> if (!node || this._suppressRevealAndSelect)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (!WebInspector.showShadowDOMSetting.value) {
+ while (node && node.isInShadowTree())
+ node = node.parentNode;
+ if (!node)
+ return;
+ }
+
</ins><span class="cx"> var treeElement = this.createTreeElementFor(node);
</span><span class="cx"> if (!treeElement)
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>