<!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>[193031] branches/safari-601-branch</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/193031">193031</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:33:33 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/187507">r187507</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceModelsDOMNodejs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsinspectordomtemplatecontentexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/dom/template-content-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectordomtemplatecontenthtml">branches/safari-601-branch/LayoutTests/inspector/dom/template-content.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193030 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:33:26 UTC (rev 193030)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187507. rdar://problem/23221163
+
+ 2015-07-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Include <template> node content in DOM Tree
+ https://bugs.webkit.org/show_bug.cgi?id=147335
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/dom/template-content-expected.txt: Added.
+ * inspector/dom/template-content.html: Added.
+
+2015-12-01 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187496. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-28 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordomtemplatecontentexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/dom/template-content-expected.txt (0 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/dom/template-content-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/dom/template-content-expected.txt 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+Test that we include template content in DOM Nodes for <template> elements.
+
+PASS: Got DOMNode for div element
+PASS: DOMNode does not have template content
+
+PASS: Got DOMNode for template element
+PASS: DOMNode has template content
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectordomtemplatecontenthtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/dom/template-content.html (0 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/dom/template-content.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/dom/template-content.html 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script>
+function test() {
+ WebInspector.domTreeManager.requestDocument(function(documentNode) {
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#div", function(nodeId) {
+ var domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.expectThat(domNode, "Got DOMNode for div element");
+ InspectorTest.expectThat(!domNode.templateContent(), "DOMNode does not have template content");
+ });
+
+ WebInspector.domTreeManager.querySelector(documentNode.id, "#template", function(nodeId) {
+ var domNode = WebInspector.domTreeManager.nodeForId(nodeId);
+ InspectorTest.log("");
+ InspectorTest.expectThat(domNode, "Got DOMNode for template element");
+ InspectorTest.expectThat(domNode.templateContent(), "DOMNode has template content");
+ InspectorTest.completeTest();
+ });
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Test that we include template content in DOM Nodes for &lt;template&gt; elements.</p>
+
+ <div id="div"></div>
+ <template id="template">
+ <h1>Header</h1>
+ <p>Paragraph</p>
+ </template>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193030 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:33:26 UTC (rev 193030)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-12-01 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r187507. rdar://problem/23221163
+
+ 2015-07-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Include <template> node content in DOM Tree
+ https://bugs.webkit.org/show_bug.cgi?id=147335
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Controllers/DOMTreeManager.js:
+ (WebInspector.DOMTreeManager.prototype._unbind):
+ Cleanup templateContent when DOMNodes get removed.
+
+ * UserInterface/Models/DOMNode.js:
+ (WebInspector.DOMNode.prototype.templateContent):
+ Create a DOMNode from the payload's templateContent.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._singleTextChild):
+ (WebInspector.DOMTreeElement.prototype._hasVisibleChildren):
+ (WebInspector.DOMTreeElement.prototype._visibleChildren):
+ A DOMTreeElement has children if the DOMNode has template content.
+
+2015-12-01 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r187500. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-28 Devin Rousso <drousso@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDOMTreeManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js (193030 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-12-03 18:33:26 UTC (rev 193030)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMTreeManager.js 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -289,12 +289,14 @@
</span><span class="cx"> for (var i = 0; node.children && i < node.children.length; ++i)
</span><span class="cx"> this._unbind(node.children[i]);
</span><span class="cx">
</span><ins>+ if (node.templateContent())
+ this._unbind(node.templateContent());
+
</ins><span class="cx"> var pseudoElements = node.pseudoElements();
</span><span class="cx"> for (var pseudoElement of pseudoElements)
</span><span class="cx"> this._unbind(pseudoElement);
</span><span class="cx">
</span><span class="cx"> // FIXME: Handle shadow roots.
</span><del>- // FIXME: Handle template content.
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get restoreSelectedNodeIsAllowed()
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (193030 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2015-12-03 18:33:26 UTC (rev 193030)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -79,7 +79,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: Handle templateContent.
</del><ins>+ if (payload.templateContent) {
+ this._templateContent = new WebInspector.DOMNode(this._domAgent, this.ownerDocument, true, payload.templateContent);
+ this._templateContent.parentNode = this;
+ }
</ins><span class="cx">
</span><span class="cx"> if (payload.children)
</span><span class="cx"> this._setChildrenPayload(payload.children);
</span><span class="lines">@@ -263,6 +266,11 @@
</span><span class="cx"> return this._localName;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ templateContent()
+ {
+ return this._templateContent || null;
+ }
+
</ins><span class="cx"> pseudoType()
</span><span class="cx"> {
</span><span class="cx"> return this._pseudoType;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (193030 => 193031)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 18:33:26 UTC (rev 193030)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2015-12-03 18:33:33 UTC (rev 193031)
</span><span class="lines">@@ -1262,6 +1262,8 @@
</span><span class="cx">
</span><span class="cx"> if (node.hasShadowRoots())
</span><span class="cx"> return null;
</span><ins>+ if (node.templateContent())
+ return null;
</ins><span class="cx"> if (node.hasPseudoElements())
</span><span class="cx"> return null;
</span><span class="cx">
</span><span class="lines">@@ -1288,6 +1290,8 @@
</span><span class="cx">
</span><span class="cx"> if (node.hasChildNodes())
</span><span class="cx"> return true;
</span><ins>+ if (node.templateContent())
+ return true;
</ins><span class="cx"> if (node.hasPseudoElements())
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -1300,6 +1304,10 @@
</span><span class="cx">
</span><span class="cx"> var visibleChildren = [];
</span><span class="cx">
</span><ins>+ var templateContent = node.templateContent();
+ if (templateContent)
+ visibleChildren.push(templateContent);
+
</ins><span class="cx"> var beforePseudoElement = node.beforePseudoElement();
</span><span class="cx"> if (beforePseudoElement)
</span><span class="cx"> visibleChildren.push(beforePseudoElement);
</span></span></pre>
</div>
</div>
</body>
</html>