<!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>[205035] trunk</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/205035">205035</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-26 13:29:17 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Some CSS selectors in the UI aren't escaped
https://bugs.webkit.org/show_bug.cgi?id=151378
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-08-26
Reviewed by Joseph Pecoraro.
Source/JavaScriptCore:
Change ElementData from sending a className string to using an array of
classes, allowing for proper escaping of each class value.
* inspector/protocol/OverlayTypes.json:
Source/WebCore:
No new tests, but logic and results of existing tests updated:
* inspector/dom/content-node-region-info.html:
* inspector/dom/content-node-region-info-expected.txt:
* inspector/dom/highlightNode-expected.txt:
* inspector/dom/highlightSelector.html:
* inspector/dom/highlightSelector-expected.txt:
* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForElementData):
* inspector/InspectorOverlayPage.css:
(.pseudo-type):
(.tag-name): Deleted.
* inspector/InspectorOverlayPage.js:
(_createElementTitle):
Source/WebInspectorUI:
* UserInterface/Base/DOMUtilities.js:
(WebInspector.displayNameForNode): Deleted.
(WebInspector.linkifyNodeReference):
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
* UserInterface/Models/DOMNode.js:
(WebInspector.DOMNode.prototype.get escapedIdSelector):
(WebInspector.DOMNode.prototype.get escapedClassSelector):
(WebInspector.DOMNode.prototype.get displayName):
(WebInspector.DOMNode.prototype.appropriateSelectorFor):
Rework escaping of ids and class names into separate public functions using CSS.escape.
* UserInterface/Views/CSSStyleDeclarationSection.js:
(WebInspector.CSSStyleDeclarationSection.prototype.refresh):
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
* UserInterface/Views/DOMTreeDataGridNode.js:
(WebInspector.DOMTreeDataGridNode.prototype._createNameCellDocumentFragment):
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
* UserInterface/Views/DOMTreeElementPathComponent.js:
(WebInspector.DOMTreeElementPathComponent):
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
* UserInterface/Views/LayerTreeDataGridNode.js:
(WebInspector.LayerTreeDataGridNode.prototype.set layer):
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
* UserInterface/Views/VisualStyleSelectorSection.js:
(WebInspector.VisualStyleSelectorSection.prototype.update):
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
LayoutTests:
* inspector/dom/content-node-region-info.html:
* inspector/dom/content-node-region-info-expected.txt:
Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
* inspector/dom/highlightNode-expected.txt:
* inspector/dom/highlightSelector.html:
* inspector/dom/highlightSelector-expected.txt:
Changed result to replace className with new classes array.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordomcontentnoderegioninfohtml">trunk/LayoutTests/inspector/dom/content-node-region-info.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightNodeexpectedtxt">trunk/LayoutTests/inspector/dom/highlightNode-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightSelectorexpectedtxt">trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightSelectorhtml">trunk/LayoutTests/inspector/dom/highlightSelector.html</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolOverlayTypesjson">trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayPagecss">trunk/Source/WebCore/inspector/InspectorOverlayPage.css</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayPagejs">trunk/Source/WebCore/inspector/InspectorOverlayPage.js</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseDOMUtilitiesjs">trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs">trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementPathComponentjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDataGridNodejs">trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDataGridNode.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleSelectorSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/LayoutTests/ChangeLog        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-26 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Some CSS selectors in the UI aren't escaped
+ https://bugs.webkit.org/show_bug.cgi?id=151378
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/dom/content-node-region-info.html:
+ * inspector/dom/content-node-region-info-expected.txt:
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
+ * inspector/dom/highlightNode-expected.txt:
+ * inspector/dom/highlightSelector.html:
+ * inspector/dom/highlightSelector-expected.txt:
+ Changed result to replace className with new classes array.
+
</ins><span class="cx"> 2016-08-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLAreaElement's coords attributes parsing does not comply with the HTML specification
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomcontentnoderegioninfohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/content-node-region-info.html (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/content-node-region-info.html        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/LayoutTests/inspector/dom/content-node-region-info.html        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx"> <script>
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- var queryList = ["#flow", ".contentNode1", ".contentNode2", "body", "#region1", "#region2"];
- var documentNodeId;
</del><ins>+ let displayNameGetter = Object.getOwnPropertyDescriptor(WebInspector.DOMNode.prototype, "displayName").get;
+ let queryList = ["#flow", ".contentNode1", ".contentNode2", "body", "#region1", "#region2"];
+ let documentNodeId = null;
</ins><span class="cx">
</span><span class="cx"> WebInspector.domTreeManager.requestDocument(function(documentNode) {
</span><span class="cx"> documentNodeId = documentNode.id;
</span><span class="lines">@@ -36,6 +37,11 @@
</span><span class="cx"> next();
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ function regionMapFunction(region)
+ {
+ return displayNameGetter.call(region);
+ }
+
</ins><span class="cx"> function query(selector, callback)
</span><span class="cx"> {
</span><span class="cx"> InspectorTest.log("\nSelector: " + selector);
</span><span class="lines">@@ -44,7 +50,7 @@
</span><span class="cx"> InspectorTest.log("DOM node not found.");
</span><span class="cx"> callback();
</span><span class="cx"> }
</span><del>- var domNode = WebInspector.domTreeManager.nodeForId(contentNodeId);
</del><ins>+ let domNode = WebInspector.domTreeManager.nodeForId(contentNodeId);
</ins><span class="cx"> WebInspector.domTreeManager.getNodeContentFlowInfo(domNode, function(error, result) {
</span><span class="cx"> console.assert(!error);
</span><span class="cx"> if (result) {
</span><span class="lines">@@ -51,7 +57,7 @@
</span><span class="cx"> InspectorTest.log("Region flow name: " + (result.regionFlow ? result.regionFlow.name : "none"));
</span><span class="cx"> InspectorTest.log("Content flow name: " + (result.contentFlow ? result.contentFlow.name : "none"));
</span><span class="cx"> InspectorTest.log("Regions count: " + (result.regions ? result.regions.length : "N/A"));
</span><del>- InspectorTest.log("Regions: " + (result.regions ? result.regions.map(WebInspector.displayNameForNode).join(", ") : "N/A"));
</del><ins>+ InspectorTest.log("Regions: " + (result.regions ? result.regions.map(regionMapFunction).join(", ") : "N/A"));
</ins><span class="cx"> } else
</span><span class="cx"> InspectorTest.log("No region flow information.");
</span><span class="cx"> callback();
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlightNode-expected.txt (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/highlightNode-expected.txt        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/LayoutTests/inspector/dom/highlightNode-expected.txt        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameNodeViaNodeId
</span><span class="cx"> PASS: Should be one highlighted node.
</span><del>-Highlighted Element Data: {"tagName":"div","idValue":"id-one","className":".class-two","size":{"width":100,"height":200},"role":""}
</del><ins>+Highlighted Element Data: {"tagName":"div","idValue":"id-one","classes":["class-two"],"size":{"width":100,"height":200},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: ChildFrameNodeViaNodeId
</span><span class="cx"> PASS: Should be one highlighted node.
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameNodeViaObjectId
</span><span class="cx"> PASS: Should be one highlighted node.
</span><del>-Highlighted Element Data: {"tagName":"div","idValue":"id-one","className":".class-two","size":{"width":100,"height":200},"role":""}
</del><ins>+Highlighted Element Data: {"tagName":"div","idValue":"id-one","classes":["class-two"],"size":{"width":100,"height":200},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: ChildFrameNodeViaObjectId
</span><span class="cx"> PASS: Should be one highlighted node.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightSelectorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx"> PASS: Should highlight 3 element(s).
</span><span class="cx"> Highlighted Elements:
</span><span class="cx"> {"tagName":"div","idValue":"","size":{"width":500,"height":500},"role":""}
</span><del>-{"tagName":"div","idValue":"","className":".class-one","size":{"width":10,"height":20},"role":""}
-{"tagName":"div","idValue":"id-one","className":".class-two","size":{"width":100,"height":200},"role":""}
</del><ins>+{"tagName":"div","idValue":"","classes":["class-one",".escaped"],"size":{"width":10,"height":20},"role":""}
+{"tagName":"div","idValue":"id-one","classes":["class-two"],"size":{"width":100,"height":200},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameWithClassSelector
</span><span class="cx"> - Frame: <main-frame>
</span><span class="lines">@@ -17,15 +17,22 @@
</span><span class="cx"> - Selector: .class-one
</span><span class="cx"> PASS: Should highlight 2 element(s).
</span><span class="cx"> Highlighted Elements:
</span><del>-{"tagName":"div","idValue":"","className":".class-one","size":{"width":10,"height":20},"role":""}
-{"tagName":"iframe","idValue":"","className":".class-one","size":{"width":304,"height":154},"role":"group"}
</del><ins>+{"tagName":"div","idValue":"","classes":["class-one",".escaped"],"size":{"width":10,"height":20},"role":""}
+{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":"group"}
</ins><span class="cx">
</span><ins>+-- Running test case: MainFrameWithMultipleClassSelector
+- Frame: <main-frame>
+- Selector: .class-one.\.escaped
+PASS: Should highlight 1 element(s).
+Highlighted Elements:
+{"tagName":"div","idValue":"","classes":["class-one",".escaped"],"size":{"width":10,"height":20},"role":""}
+
</ins><span class="cx"> -- Running test case: MainFrameIdSelector
</span><span class="cx"> - Frame: <main-frame>
</span><span class="cx"> - Selector: #id-one
</span><span class="cx"> PASS: Should highlight 1 element(s).
</span><span class="cx"> Highlighted Elements:
</span><del>-{"tagName":"div","idValue":"id-one","className":".class-two","size":{"width":100,"height":200},"role":""}
</del><ins>+{"tagName":"div","idValue":"id-one","classes":["class-two"],"size":{"width":100,"height":200},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameMultipleSelectors
</span><span class="cx"> - Frame: <main-frame>
</span><span class="lines">@@ -32,9 +39,9 @@
</span><span class="cx"> - Selector: .class-one, .class-two
</span><span class="cx"> PASS: Should highlight 3 element(s).
</span><span class="cx"> Highlighted Elements:
</span><del>-{"tagName":"div","idValue":"","className":".class-one","size":{"width":10,"height":20},"role":""}
-{"tagName":"div","idValue":"id-one","className":".class-two","size":{"width":100,"height":200},"role":""}
-{"tagName":"iframe","idValue":"","className":".class-one","size":{"width":304,"height":154},"role":"group"}
</del><ins>+{"tagName":"div","idValue":"","classes":["class-one",".escaped"],"size":{"width":10,"height":20},"role":""}
+{"tagName":"div","idValue":"id-one","classes":["class-two"],"size":{"width":100,"height":200},"role":""}
+{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":"group"}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MissingOptionalFrameIdShouldUseMainFrame
</span><span class="cx"> - Frame: Not Provided
</span><span class="lines">@@ -41,7 +48,7 @@
</span><span class="cx"> - Selector: iframe.class-one
</span><span class="cx"> PASS: Should highlight 1 element(s).
</span><span class="cx"> Highlighted Elements:
</span><del>-{"tagName":"iframe","idValue":"","className":".class-one","size":{"width":304,"height":154},"role":"group"}
</del><ins>+{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":"group"}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameNonMatchingSelector
</span><span class="cx"> - Frame: <main-frame>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightSelectorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlightSelector.html (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/highlightSelector.html        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/LayoutTests/inspector/dom/highlightSelector.html        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -30,6 +30,12 @@
</span><span class="cx"> expectedElements: 2,
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ name: "MainFrameWithMultipleClassSelector",
+ frameId: mainFrameId,
+ selector: ".class-one.\\.escaped",
+ expectedElements: 1,
+ },
+ {
</ins><span class="cx"> name: "MainFrameIdSelector",
</span><span class="cx"> frameId: mainFrameId,
</span><span class="cx"> selector: "#id-one",
</span><span class="lines">@@ -133,7 +139,7 @@
</span><span class="cx"> <body onload="runTest()">
</span><span class="cx"> <p>Tests for the DOM.highlightSelector command.</p>
</span><span class="cx"> <div style="width: 500px; height: 500px">
</span><del>- <div class="class-one" style="width: 10px; height: 20px"></div>
</del><ins>+ <div class="class-one .escaped" style="width: 10px; height: 20px"></div>
</ins><span class="cx"> <div id="id-one" class="class-two" style="width:100px; height: 200px"></div>
</span><span class="cx"> <iframe class="class-one" src="resources/highlight-iframe.html"></iframe>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/JavaScriptCore/ChangeLog        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-26 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Some CSS selectors in the UI aren't escaped
+ https://bugs.webkit.org/show_bug.cgi?id=151378
+
+ Reviewed by Joseph Pecoraro.
+
+ Change ElementData from sending a className string to using an array of
+ classes, allowing for proper escaping of each class value.
+
+ * inspector/protocol/OverlayTypes.json:
+
</ins><span class="cx"> 2016-08-26 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: ScriptProfilerAgent and HeapAgent should do less work when frontend disconnects
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolOverlayTypesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/JavaScriptCore/inspector/protocol/OverlayTypes.json        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -83,9 +83,10 @@
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "tagName", "type": "string" },
</span><span class="cx"> { "name": "idValue", "type": "string", "description": "The value of the element's 'id' attribute." },
</span><del>- { "name": "className", "type": "string", "optional": true },
</del><ins>+ { "name": "classes", "type": "array", "items": { "type": "string" }, "optional": true },
</ins><span class="cx"> { "name": "size", "$ref": "Size", "optional": true },
</span><span class="cx"> { "name": "role", "type": "string", "description": "Computed accessibility role for the element.", "optional": true },
</span><ins>+ { "name": "pseudoElement", "type": "string", "optional": true },
</ins><span class="cx"> { "name": "regionFlowData", "$ref": "RegionFlowData", "optional": true },
</span><span class="cx"> { "name": "contentFlowData", "$ref": "ContentFlowData", "optional": true },
</span><span class="cx"> { "name": "shapeOutsideData", "$ref": "ShapeOutsideData", "optional": true }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebCore/ChangeLog        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-08-26 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Some CSS selectors in the UI aren't escaped
+ https://bugs.webkit.org/show_bug.cgi?id=151378
+
+ Reviewed by Joseph Pecoraro.
+
+ No new tests, but logic and results of existing tests updated:
+ * inspector/dom/content-node-region-info.html:
+ * inspector/dom/content-node-region-info-expected.txt:
+ * inspector/dom/highlightNode-expected.txt:
+ * inspector/dom/highlightSelector.html:
+ * inspector/dom/highlightSelector-expected.txt:
+
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildObjectForElementData):
+
+ * inspector/InspectorOverlayPage.css:
+ (.pseudo-type):
+ (.tag-name): Deleted.
+
+ * inspector/InspectorOverlayPage.js:
+ (_createElementTitle):
+
</ins><span class="cx"> 2016-08-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash when getting font bounding rect
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <inspector/InspectorProtocolObjects.h>
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><del>-#include <wtf/text/StringBuilder.h>
</del><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="cx">
</span><span class="lines">@@ -713,28 +712,27 @@
</span><span class="cx"> .setIdValue(element.getIdAttribute())
</span><span class="cx"> .release();
</span><span class="cx">
</span><del>- StringBuilder classNames;
</del><span class="cx"> if (element.hasClass() && is<StyledElement>(element)) {
</span><ins>+ auto classes = Inspector::Protocol::Array<String>::create();
</ins><span class="cx"> HashSet<AtomicString> usedClassNames;
</span><span class="cx"> const SpaceSplitString& classNamesString = downcast<StyledElement>(element).classNames();
</span><del>- size_t classNameCount = classNamesString.size();
- for (size_t i = 0; i < classNameCount; ++i) {
</del><ins>+ for (size_t i = 0; i < classNamesString.size(); ++i) {
</ins><span class="cx"> const AtomicString& className = classNamesString[i];
</span><span class="cx"> if (usedClassNames.contains(className))
</span><span class="cx"> continue;
</span><ins>+
</ins><span class="cx"> usedClassNames.add(className);
</span><del>- classNames.append('.');
- classNames.append(className);
</del><ins>+ classes->addItem(className);
</ins><span class="cx"> }
</span><ins>+ elementData->setClasses(WTFMove(classes));
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (node->isPseudoElement()) {
</span><span class="cx"> if (node->pseudoId() == BEFORE)
</span><del>- classNames.appendLiteral("::before");
</del><ins>+ elementData->setPseudoElement("before");
</ins><span class="cx"> else if (node->pseudoId() == AFTER)
</span><del>- classNames.appendLiteral("::after");
</del><ins>+ elementData->setPseudoElement("after");
</ins><span class="cx"> }
</span><del>- if (!classNames.isEmpty())
- elementData->setClassName(classNames.toString());
</del><span class="cx">
</span><span class="cx"> RenderElement* renderer = element.renderer();
</span><span class="cx"> if (!renderer)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayPagecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlayPage.css (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlayPage.css        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebCore/inspector/InspectorOverlayPage.css        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -59,7 +59,8 @@
</span><span class="cx"> position: absolute;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.tag-name {
</del><ins>+.tag-name,
+.pseudo-type {
</ins><span class="cx"> /* Keep this in sync with XMLViewer.css (.tag) */
</span><span class="cx"> color: rgb(136, 18, 128);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayPagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlayPage.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlayPage.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebCore/inspector/InspectorOverlayPage.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -263,12 +263,17 @@
</span><span class="cx">
</span><span class="cx"> function _createElementTitle(elementData)
</span><span class="cx"> {
</span><del>- var builder = new DOMBuilder("div", "element-title");
-
</del><ins>+ let builder = new DOMBuilder("div", "element-title");
+
</ins><span class="cx"> builder.appendSpanIfNotNull("tag-name", elementData.tagName);
</span><del>- builder.appendSpanIfNotNull("node-id", elementData.idValue, "#");
- builder.appendSpanIfNotNull("class-name", _truncateString(elementData.className, 50));
</del><ins>+ builder.appendSpanIfNotNull("node-id", CSS.escape(elementData.idValue), "#");
</ins><span class="cx">
</span><ins>+ let classes = elementData.classes;
+ if (classes && classes.length)
+ builder.appendSpan("class-name", _truncateString(classes.map((className) => "." + CSS.escape(className)).join(""), 50));
+
+ builder.appendSpanIfNotNull("pseudo-type", elementData.pseudoElement, "::");
+
</ins><span class="cx"> builder.appendTextNode(" ");
</span><span class="cx"> builder.appendSpan("node-width", elementData.size.width);
</span><span class="cx"> // \xd7 is the code for the &times; HTML entity.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-08-26 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Some CSS selectors in the UI aren't escaped
+ https://bugs.webkit.org/show_bug.cgi?id=151378
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/DOMUtilities.js:
+ (WebInspector.displayNameForNode): Deleted.
+ (WebInspector.linkifyNodeReference):
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
+ * UserInterface/Models/DOMNode.js:
+ (WebInspector.DOMNode.prototype.get escapedIdSelector):
+ (WebInspector.DOMNode.prototype.get escapedClassSelector):
+ (WebInspector.DOMNode.prototype.get displayName):
+ (WebInspector.DOMNode.prototype.appropriateSelectorFor):
+ Rework escaping of ids and class names into separate public functions using CSS.escape.
+
+ * UserInterface/Views/CSSStyleDeclarationSection.js:
+ (WebInspector.CSSStyleDeclarationSection.prototype.refresh):
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
+ * UserInterface/Views/DOMTreeDataGridNode.js:
+ (WebInspector.DOMTreeDataGridNode.prototype._createNameCellDocumentFragment):
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
+ * UserInterface/Views/DOMTreeElementPathComponent.js:
+ (WebInspector.DOMTreeElementPathComponent):
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
+ * UserInterface/Views/LayerTreeDataGridNode.js:
+ (WebInspector.LayerTreeDataGridNode.prototype.set layer):
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
+ * UserInterface/Views/VisualStyleSelectorSection.js:
+ (WebInspector.VisualStyleSelectorSection.prototype.update):
+ Use DOMNode.prototype.displayName instead of WebInspector.displayNameForNode.
+
</ins><span class="cx"> 2016-08-24 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: unexpected cursor changes while dragging ruler handle in rendering frames timeline
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseDOMUtilitiesjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/DOMUtilities.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -29,36 +29,6 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-WebInspector.displayNameForNode = function(node)
-{
- var title = node.nodeNameInCorrectCase();
-
- var idAttribute = node.getAttribute("id");
- if (idAttribute) {
- if (/[\s'"]/.test(idAttribute)) {
- idAttribute = idAttribute.replace(/\\/g, "\\\\").replace(/\"/g, "\\\"");
- title += "[id=\"" + idAttribute + "\"]";
- } else
- title += "#" + idAttribute;
- }
-
- var classAttribute = node.getAttribute("class");
- if (classAttribute) {
- var classes = classAttribute.trim().split(/\s+/);
- var foundClasses = {};
-
- for (var i = 0; i < classes.length; ++i) {
- var className = classes[i];
- if (className && !(className in foundClasses)) {
- title += "." + className;
- foundClasses[className] = true;
- }
- }
- }
-
- return title;
-};
-
</del><span class="cx"> WebInspector.roleSelectorForNode = function(node)
</span><span class="cx"> {
</span><span class="cx"> // This is proposed syntax for CSS 4 computed role selector :role(foo) and subject to change.
</span><span class="lines">@@ -89,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.linkifyNodeReference = function(node, maxLength)
</span><span class="cx"> {
</span><del>- let displayName = WebInspector.displayNameForNode(node);
</del><ins>+ let displayName = node.displayName;
</ins><span class="cx"> if (!isNaN(maxLength))
</span><span class="cx"> displayName = displayName.truncate(maxLength);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsDOMNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -520,28 +520,62 @@
</span><span class="cx"> return path.join(",");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get escapedIdSelector()
+ {
+ let id = this.getAttribute("id");
+ if (!id)
+ return "";
+
+ id = id.trim();
+ if (!id.length)
+ return "";
+
+ id = CSS.escape(id);
+ if (/[\s'"]/.test(id))
+ return `[id=\"${id}\"]`;
+
+ return `#${id}`;
+ }
+
+ get escapedClassSelector()
+ {
+ let classes = this.getAttribute("class");
+ if (!classes)
+ return "";
+
+ classes = classes.trim();
+ if (!classes.length)
+ return "";
+
+ let foundClasses = new Set;
+ return classes.split(/\s+/).reduce((selector, className) => {
+ if (!className.length || foundClasses.has(className))
+ return selector;
+
+ foundClasses.add(className);
+ return `${selector}.${CSS.escape(className)}`;
+ }, "");
+ }
+
+ get displayName()
+ {
+ return this.nodeNameInCorrectCase() + this.escapedIdSelector + this.escapedClassSelector;
+ }
+
</ins><span class="cx"> appropriateSelectorFor(justSelector)
</span><span class="cx"> {
</span><span class="cx"> if (this.isPseudoElement())
</span><span class="cx"> return this.parentNode.appropriateSelectorFor() + "::" + this._pseudoType;
</span><span class="cx">
</span><del>- var lowerCaseName = this.localName() || this.nodeName().toLowerCase();
</del><ins>+ let lowerCaseName = this.localName() || this.nodeName().toLowerCase();
</ins><span class="cx">
</span><del>- var id = this.getAttribute("id");
- if (id) {
- if (/[\s'"]/.test(id)) {
- id = id.replace(/\\/g, "\\\\").replace(/\"/g, "\\\"");
- selector = lowerCaseName + "[id=\"" + id + "\"]";
- } else
- selector = "#" + id;
- return (justSelector ? selector : lowerCaseName + selector);
- }
</del><ins>+ let id = this.escapedIdSelector;
+ if (id.length)
+ return justSelector ? id : lowerCaseName + id;
</ins><span class="cx">
</span><del>- var className = this.getAttribute("class");
- if (className) {
- var selector = "." + className.trim().replace(/\s+/g, ".");
- return (justSelector ? selector : lowerCaseName + selector);
- }
</del><ins>+ let classes = this.escapedClassSelector;
+ if (classes.length)
+ return justSelector ? classes : lowerCaseName + classes;
</ins><span class="cx">
</span><span class="cx"> if (lowerCaseName === "input" && this.getAttribute("type"))
</span><span class="cx"> return lowerCaseName + "[type=\"" + this.getAttribute("type") + "\"]";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCSSStyleDeclarationSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CSSStyleDeclarationSection.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -261,12 +261,12 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.CSSStyleDeclaration.Type.Inline:
</span><del>- appendSelectorTextKnownToMatch.call(this, WebInspector.displayNameForNode(this._style.node));
</del><ins>+ appendSelectorTextKnownToMatch.call(this, this._style.node.displayName);
</ins><span class="cx"> this._originElement.append(WebInspector.UIString("Style Attribute"));
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WebInspector.CSSStyleDeclaration.Type.Attribute:
</span><del>- appendSelectorTextKnownToMatch.call(this, WebInspector.displayNameForNode(this._style.node));
</del><ins>+ appendSelectorTextKnownToMatch.call(this, this._style.node.displayName);
</ins><span class="cx"> this._originElement.append(WebInspector.UIString("HTML Attributes"));
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeDataGridNode.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> _createNameCellDocumentFragment()
</span><span class="cx"> {
</span><span class="cx"> let fragment = document.createDocumentFragment();
</span><del>- let mainTitle = WebInspector.displayNameForNode(this._domNode);
</del><ins>+ let mainTitle = this._domNode.displayName;
</ins><span class="cx"> fragment.append(mainTitle);
</span><span class="cx">
</span><span class="cx"> let goToButton = fragment.appendChild(WebInspector.createGoToArrowButton());
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMTreeElementPathComponentjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeElementPathComponent.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> title = "::" + node.pseudoType();
</span><span class="cx"> } else {
</span><span class="cx"> className = WebInspector.DOMTreeElementPathComponent.DOMElementIconStyleClassName;
</span><del>- title = WebInspector.displayNameForNode(node);
</del><ins>+ title = node.displayName;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> if (node.shadowRootType())
</span><span class="cx"> title = WebInspector.UIString("Shadow Content");
</span><span class="cx"> else
</span><del>- title = WebInspector.displayNameForNode(node);
</del><ins>+ title = node.displayName;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Node.PROCESSING_INSTRUCTION_NODE:
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDataGridNodejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDataGridNode.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDataGridNode.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDataGridNode.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> var domNode = WebInspector.domTreeManager.nodeForId(layer.nodeId);
</span><span class="cx">
</span><span class="cx"> this.data = {
</span><del>- name: domNode ? WebInspector.displayNameForNode(domNode) : WebInspector.UIString("Unknown node"),
</del><ins>+ name: domNode ? domNode.displayName : WebInspector.UIString("Unknown node"),
</ins><span class="cx"> paintCount: layer.paintCount || emDash,
</span><span class="cx"> memory: Number.bytesToString(layer.memory || 0)
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleSelectorSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js (205034 => 205035)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js        2016-08-26 20:22:24 UTC (rev 205034)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleSelectorSection.js        2016-08-26 20:29:17 UTC (rev 205035)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (!divider) {
</span><del>- let dividerText = WebInspector.UIString("Inherited from %s").format(WebInspector.displayNameForNode(inherited.node));
</del><ins>+ let dividerText = WebInspector.UIString("Inherited from %s").format(inherited.node.displayName);
</ins><span class="cx"> divider = new WebInspector.GeneralTreeElement("section-divider", dividerText);
</span><span class="cx"> divider.selectable = false;
</span><span class="cx"> this._selectors.appendChild(divider);
</span></span></pre>
</div>
</div>
</body>
</html>