<!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>[178373] 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/178373">178373</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-13 13:44:21 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: I do not expect to see the same rule multiple times in styles sidebar
https://bugs.webkit.org/show_bug.cgi?id=138185
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-01-13
Reviewed by Timothy Hatcher.
In the styles sidebar, don't show a duplicate, lesser-specificity rule even
if it matches the selected element multiple times with different selectors
in the list.
* UserInterface/Models/CSSRule.js:
(WebInspector.CSSRule.prototype.isEqualTo):
CSSRule identifiers are objects.
* UserInterface/Views/RulesStyleDetailsPanel.js:
(WebInspector.RulesStyleDetailsPanel.prototype.refresh):
Remove duplicates from the ordered list of style declarations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCSSRulejs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (178372 => 178373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-01-13 21:21:40 UTC (rev 178372)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-01-13 21:44:21 UTC (rev 178373)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: I do not expect to see the same rule multiple times in styles sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=138185
+
+ Reviewed by Timothy Hatcher.
+
+ In the styles sidebar, don't show a duplicate, lesser-specificity rule even
+ if it matches the selected element multiple times with different selectors
+ in the list.
+
+ * UserInterface/Models/CSSRule.js:
+ (WebInspector.CSSRule.prototype.isEqualTo):
+ CSSRule identifiers are objects.
+
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh):
+ Remove duplicates from the ordered list of style declarations.
+
</ins><span class="cx"> 2015-01-12 Jonathan Wells <jonowells@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Timeline: when Network Requests view is selected, in progress requests are absent.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSRulejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (178372 => 178373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-01-13 21:21:40 UTC (rev 178372)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-01-13 21:44:21 UTC (rev 178373)
</span><span class="lines">@@ -188,6 +188,14 @@
</span><span class="cx"> return this._mediaList;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ isEqualTo: function(rule)
+ {
+ if (!rule)
+ return false;
+
+ return Object.shallowEqual(this._id, rule.id);
+ },
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> get nodeStyles()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (178372 => 178373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-01-13 21:21:40 UTC (rev 178372)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-01-13 21:44:21 UTC (rev 178373)
</span><span class="lines">@@ -92,6 +92,31 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function uniqueOrderedStyles(orderedStyles)
+ {
+ var uniqueStyles = [];
+
+ for (var style of orderedStyles) {
+ var rule = style.ownerRule;
+ if (!rule) {
+ uniqueStyles.push(style);
+ continue;
+ }
+
+ var found = false;
+ for (var existingStyle of uniqueStyles) {
+ if (rule.isEqualTo(existingStyle.ownerRule)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ uniqueStyles.push(style);
+ }
+
+ return uniqueStyles;
+ }
+
</ins><span class="cx"> function appendStyleSection(style)
</span><span class="cx"> {
</span><span class="cx"> var section = style.__rulesSection;
</span><span class="lines">@@ -138,10 +163,9 @@
</span><span class="cx"> var pseudoElements = this.nodeStyles.pseudoElements;
</span><span class="cx"> for (var pseudoIdentifier in pseudoElements) {
</span><span class="cx"> var pseudoElement = pseudoElements[pseudoIdentifier];
</span><del>- for (var i = 0; i < pseudoElement.orderedStyles.length; ++i) {
- var style = pseudoElement.orderedStyles[i];
</del><ins>+ var orderedStyles = uniqueOrderedStyles(pseudoElement.orderedStyles);
+ for (var style of orderedStyles)
</ins><span class="cx"> appendStyleSection.call(this, style);
</span><del>- }
</del><span class="cx">
</span><span class="cx"> if (previousSection)
</span><span class="cx"> previousSection.lastInGroup = true;
</span><span class="lines">@@ -149,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> var addedNewRuleButton = false;
</span><span class="cx">
</span><del>- var orderedStyles = this.nodeStyles.orderedStyles;
</del><ins>+ var orderedStyles = uniqueOrderedStyles(this.nodeStyles.orderedStyles);
</ins><span class="cx"> for (var i = 0; i < orderedStyles.length; ++i) {
</span><span class="cx"> var style = orderedStyles[i];
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>