<!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>[201965] trunk/Source/WebInspectorUI</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/201965">201965</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-10 22:32:44 -0700 (Fri, 10 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: <template> content should not be hidden as Shadow Content
https://bugs.webkit.org/show_bug.cgi?id=158654
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-06-10
Reviewed by Ryosuke Niwa.
* Localizations/en.lproj/localizedStrings.js:
New "Template Content" string.
* UserInterface/Models/DOMNode.js:
(WebInspector.DOMNode):
Don't treat template content as shadow content.
* UserInterface/Views/DOMTreeElement.js:
(WebInspector.DOMTreeElement.prototype._nodeTitleInfo):
Custom string for template content fragment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201964 => 201965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-11 05:31:48 UTC (rev 201964)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-11 05:32:44 UTC (rev 201965)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-10 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: <template> content should not be hidden as Shadow Content
+ https://bugs.webkit.org/show_bug.cgi?id=158654
+
+ Reviewed by Ryosuke Niwa.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ New "Template Content" string.
+
+ * UserInterface/Models/DOMNode.js:
+ (WebInspector.DOMNode):
+ Don't treat template content as shadow content.
+
+ * UserInterface/Views/DOMTreeElement.js:
+ (WebInspector.DOMTreeElement.prototype._nodeTitleInfo):
+ Custom string for template content fragment.
+
</ins><span class="cx"> 2016-06-10 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: heap snapshot comparison view shows nothing if later snapshot is chosen first
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (201964 => 201965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-06-11 05:31:48 UTC (rev 201964)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-06-11 05:32:44 UTC (rev 201965)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx"> localizedStrings["Back (%s)"] = "Back (%s)";
</span><span class="cx"> localizedStrings["Background"] = "Background";
</span><span class="cx"> localizedStrings["Basis"] = "Basis";
</span><del>-localizedStrings["Begin Capturing"] = "Begin Capturing";
</del><span class="cx"> localizedStrings["Blend"] = "Blend";
</span><span class="cx"> localizedStrings["Block Variables"] = "Block Variables";
</span><span class="cx"> localizedStrings["Blur"] = "Blur";
</span><span class="lines">@@ -290,7 +289,6 @@
</span><span class="cx"> localizedStrings["Enable paint flashing"] = "Enable paint flashing";
</span><span class="cx"> localizedStrings["Encoded"] = "Encoded";
</span><span class="cx"> localizedStrings["Encoding"] = "Encoding";
</span><del>-localizedStrings["End Capturing"] = "End Capturing";
</del><span class="cx"> localizedStrings["Enter Class Name"] = "Enter Class Name";
</span><span class="cx"> localizedStrings["Enter Tag"] = "Enter Tag";
</span><span class="cx"> localizedStrings["Enter Value"] = "Enter Value";
</span><span class="lines">@@ -320,7 +318,6 @@
</span><span class="cx"> localizedStrings["Filename"] = "Filename";
</span><span class="cx"> localizedStrings["Fill"] = "Fill";
</span><span class="cx"> localizedStrings["Fill Mode"] = "Fill Mode";
</span><del>-localizedStrings["Filter %s"] = "Filter %s";
</del><span class="cx"> localizedStrings["Filter Console Log"] = "Filter Console Log";
</span><span class="cx"> localizedStrings["Filter List"] = "Filter List";
</span><span class="cx"> localizedStrings["Filter Records"] = "Filter Records";
</span><span class="lines">@@ -352,11 +349,8 @@
</span><span class="cx"> localizedStrings["Fragment"] = "Fragment";
</span><span class="cx"> localizedStrings["Frame %d"] = "Frame %d";
</span><span class="cx"> localizedStrings["Frame URL"] = "Frame URL";
</span><del>-localizedStrings["Frame: %d (%s \u2013 %s)"] = "Frame: %d (%s \u2013 %s)";
</del><span class="cx"> localizedStrings["Frames"] = "Frames";
</span><span class="cx"> localizedStrings["Frames %d \u2013 %d"] = "Frames %d \u2013 %d";
</span><del>-localizedStrings["Frames: %d \u2013 %d (%s \u2013 %s)"] = "Frames: %d \u2013 %d (%s \u2013 %s)";
-localizedStrings["Frames: None Selected"] = "Frames: None Selected";
</del><span class="cx"> localizedStrings["Full Garbage Collection"] = "Full Garbage Collection";
</span><span class="cx"> localizedStrings["Full URL"] = "Full URL";
</span><span class="cx"> localizedStrings["Function"] = "Function";
</span><span class="lines">@@ -373,7 +367,6 @@
</span><span class="cx"> localizedStrings["HTTP"] = "HTTP";
</span><span class="cx"> localizedStrings["Heap Snapshot Object (@%d)"] = "Heap Snapshot Object (@%d)";
</span><span class="cx"> localizedStrings["Height"] = "Height";
</span><del>-localizedStrings["Hide Replay Controls"] = "Hide Replay Controls";
</del><span class="cx"> localizedStrings["Hide compositing borders"] = "Hide compositing borders";
</span><span class="cx"> localizedStrings["Hide shadow DOM nodes"] = "Hide shadow DOM nodes";
</span><span class="cx"> localizedStrings["Hide the details sidebar (%s)"] = "Hide the details sidebar (%s)";
</span><span class="lines">@@ -558,7 +551,6 @@
</span><span class="cx"> localizedStrings["Range Issue"] = "Range Issue";
</span><span class="cx"> localizedStrings["Readonly"] = "Readonly";
</span><span class="cx"> localizedStrings["Reasons for compositing:"] = "Reasons for compositing:";
</span><del>-localizedStrings["Recording"] = "Recording";
</del><span class="cx"> localizedStrings["Recording Timeline Data"] = "Recording Timeline Data";
</span><span class="cx"> localizedStrings["Reference Issue"] = "Reference Issue";
</span><span class="cx"> localizedStrings["Reflection"] = "Reflection";
</span><span class="lines">@@ -614,7 +606,6 @@
</span><span class="cx"> localizedStrings["Select comparison snapshot"] = "Select comparison snapshot";
</span><span class="cx"> localizedStrings["Selected"] = "Selected";
</span><span class="cx"> localizedStrings["Selected Element"] = "Selected Element";
</span><del>-localizedStrings["Selected Frames"] = "Selected Frames";
</del><span class="cx"> localizedStrings["Selected Item"] = "Selected Item";
</span><span class="cx"> localizedStrings["Selected Items"] = "Selected Items";
</span><span class="cx"> localizedStrings["Selected Symbol"] = "Selected Symbol";
</span><span class="lines">@@ -636,7 +627,6 @@
</span><span class="cx"> localizedStrings["Show All"] = "Show All";
</span><span class="cx"> localizedStrings["Show All Nodes (%d More)"] = "Show All Nodes (%d More)";
</span><span class="cx"> localizedStrings["Show Remaining (%d)"] = "Show Remaining (%d)";
</span><del>-localizedStrings["Show Replay Controls"] = "Show Replay Controls";
</del><span class="cx"> localizedStrings["Show Source"] = "Show Source";
</span><span class="cx"> localizedStrings["Show all resources"] = "Show all resources";
</span><span class="cx"> localizedStrings["Show compositing borders"] = "Show compositing borders";
</span><span class="lines">@@ -693,6 +683,7 @@
</span><span class="cx"> localizedStrings["Stylesheet"] = "Stylesheet";
</span><span class="cx"> localizedStrings["Stylesheets"] = "Stylesheets";
</span><span class="cx"> localizedStrings["Take snapshot"] = "Take snapshot";
</span><ins>+localizedStrings["Template Content"] = "Template Content";
</ins><span class="cx"> localizedStrings["Text"] = "Text";
</span><span class="cx"> localizedStrings["Text Node"] = "Text Node";
</span><span class="cx"> localizedStrings["Text Only"] = "Text Only";
</span><span class="lines">@@ -710,7 +701,6 @@
</span><span class="cx"> localizedStrings["This property needs a value.\nClick to open autocomplete."] = "This property needs a value.\nClick to open autocomplete.";
</span><span class="cx"> localizedStrings["Time"] = "Time";
</span><span class="cx"> localizedStrings["Time until the load event fired, click to show the Network Requests timeline"] = "Time until the load event fired, click to show the Network Requests timeline";
</span><del>-localizedStrings["Timeline Events"] = "Timeline Events";
</del><span class="cx"> localizedStrings["Timeline Recording %d"] = "Timeline Recording %d";
</span><span class="cx"> localizedStrings["Timelines"] = "Timelines";
</span><span class="cx"> localizedStrings["Timer %s Fired"] = "Timer %s Fired";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (201964 => 201965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-06-11 05:31:48 UTC (rev 201964)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js 2016-06-11 05:32:44 UTC (rev 201965)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (payload.templateContent) {
</span><del>- this._templateContent = new WebInspector.DOMNode(this._domTreeManager, this.ownerDocument, true, payload.templateContent);
</del><ins>+ this._templateContent = new WebInspector.DOMNode(this._domTreeManager, this.ownerDocument, false, payload.templateContent);
</ins><span class="cx"> this._templateContent.parentNode = this;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js (201964 => 201965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2016-06-11 05:31:48 UTC (rev 201964)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js 2016-06-11 05:32:44 UTC (rev 201965)
</span><span class="lines">@@ -1198,7 +1198,9 @@
</span><span class="cx"> if (node.isInShadowTree()) {
</span><span class="cx"> fragmentElement.textContent = WebInspector.UIString("Shadow Content");
</span><span class="cx"> fragmentElement.classList.add("shadow");
</span><del>- } else
</del><ins>+ } else if (node.parentNode && node.parentNode.templateContent() === node)
+ fragmentElement.textContent = WebInspector.UIString("Template Content");
+ else
</ins><span class="cx"> fragmentElement.textContent = WebInspector.UIString("Document Fragment");
</span><span class="cx"> break;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>