<!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>[186635] 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/186635">186635</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 14:57:32 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Pseudo-element style ordering is wrong for pseudo-styles on unique selectors
https://bugs.webkit.org/show_bug.cgi?id=146804
Reviewed by Timothy Hatcher.
* UserInterface/Models/CSSRule.js:
(WebInspector.CSSRule.prototype.selectorIsGreater):
Loops through the selectors in a rule to check if their specificity is greater than a given selector's specificity.
* UserInterface/Models/CSSSelector.js:
(WebInspector.CSSSelector.prototype.isGreaterThan):
Determines if the given selector's specificity is greater than this selector's specificity.
(WebInspector.CSSSelector):
* UserInterface/Views/RulesStyleDetailsPanel.js:
(WebInspector.RulesStyleDetailsPanel.prototype.refresh):
If the pseudo-element selector's specificity is greater than the current selector's
specificity, create the pseudo-element's section and add it before the current style.</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="#trunkSourceWebInspectorUIUserInterfaceModelsCSSSelectorjs">trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.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 (186634 => 186635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-09 21:57:32 UTC (rev 186635)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-07-09 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Pseudo-element style ordering is wrong for pseudo-styles on unique selectors
+ https://bugs.webkit.org/show_bug.cgi?id=146804
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/CSSRule.js:
+ (WebInspector.CSSRule.prototype.selectorIsGreater):
+ Loops through the selectors in a rule to check if their specificity is greater than a given selector's specificity.
+ * UserInterface/Models/CSSSelector.js:
+ (WebInspector.CSSSelector.prototype.isGreaterThan):
+ Determines if the given selector's specificity is greater than this selector's specificity.
+ (WebInspector.CSSSelector):
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh):
+ If the pseudo-element selector's specificity is greater than the current selector's
+ specificity, create the pseudo-element's section and add it before the current style.
+
+2015-07-09 Devin Rousso <drousso@apple.com>
+
</ins><span class="cx"> Web Inspector: Special Logs to Console that do not have an expression should be styled differently, looks like code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143840
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSRulejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js (186634 => 186635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js 2015-07-09 21:57:32 UTC (rev 186635)
</span><span class="lines">@@ -182,6 +182,32 @@
</span><span class="cx"> return Object.shallowEqual(this._id, rule.id);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ selectorIsGreater(otherSelectors)
+ {
+ if (!otherSelectors || !otherSelectors.length)
+ return true;
+
+ var selectorIsGreater = true;
+
+ var selectors = this.matchedSelectors;
+ if (!selectors.length)
+ selectors = this._selectors;
+
+ for (var selector of selectors) {
+ for (var otherSelector of otherSelectors) {
+ if (selector.isGreaterThan(otherSelector))
+ continue;
+
+ selectorIsGreater = false;
+ }
+
+ if (selectorIsGreater)
+ return true;
+ }
+
+ return false;
+ }
+
</ins><span class="cx"> // Protected
</span><span class="cx">
</span><span class="cx"> get nodeStyles()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCSSSelectorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js (186634 => 186635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js 2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSSelector.js 2015-07-09 21:57:32 UTC (rev 186635)
</span><span class="lines">@@ -52,4 +52,19 @@
</span><span class="cx"> {
</span><span class="cx"> return this._dynamic;
</span><span class="cx"> }
</span><ins>+
+ isGreaterThan(selector)
+ {
+ if (!selector || !selector.specificity)
+ return true;
+
+ for (var i = 0; i < this._specificity.length; ++i) {
+ if (this._specificity[i] === selector.specificity[i])
+ continue;
+
+ return this._specificity[i] > selector.specificity[i];
+ }
+
+ return false;
+ }
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (186634 => 186635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-07-09 21:54:11 UTC (rev 186634)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-07-09 21:57:32 UTC (rev 186635)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> var pseudoElementSelectors = [];
</span><span class="cx">
</span><span class="cx"> for (var style of orderedPseudoStyles)
</span><del>- pseudoElementSelectors.push({ style, selectorText: style.ownerRule.selectorText.replace(/:{1,2}[\w-]+\s*/, " ").trimRight() });
</del><ins>+ pseudoElementSelectors.push({ style, selectorText: style.ownerRule.selectorText.replace(/:{1,2}[\w-]+\s*/g, " ").trimRight() });
</ins><span class="cx">
</span><span class="cx"> // Reverse the array to allow ensure that splicing the array will not mess with the order.
</span><span class="cx"> if (pseudoElementSelectors.length)
</span><span class="lines">@@ -263,12 +263,15 @@
</span><span class="cx">
</span><span class="cx"> this._ruleMediaAndInherticanceList.push(hasMediaOrInherited);
</span><span class="cx">
</span><del>- if (pseudoElementSelectors.length && style.ownerRule) {
</del><ins>+ var ownerRule = style.ownerRule;
+
+ if (pseudoElementSelectors.length && ownerRule) {
</ins><span class="cx"> for (var j = pseudoElementSelectors.length - 1; j >= 0; --j) {
</span><span class="cx"> var pseudoElement = pseudoElementSelectors[j];
</span><ins>+ var matchedSelectorText = ownerRule.matchedSelectorText;
</ins><span class="cx">
</span><del>- if (style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent || style.inerhited
- || (pseudoElement.lastMatchingSelector && pseudoElement.lastMatchingSelector !== style.ownerRule.selectorText)) {
</del><ins>+ if (ownerRule.type === WebInspector.CSSRule.Type.UserAgent || style.inerhited
+ || (pseudoElement.lastMatchingSelector && pseudoElement.lastMatchingSelector !== matchedSelectorText)) {
</ins><span class="cx"> appendStyleSection.call(this, pseudoElement.style);
</span><span class="cx"> pseudoElementSelectors.splice(j, 1);
</span><span class="cx"> this._ruleMediaAndInherticanceList.push(hasMediaOrInherited);
</span><span class="lines">@@ -276,8 +279,8 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (style.ownerRule.selectorText.includes(pseudoElement.selectorText))
- pseudoElement.lastMatchingSelector = style.ownerRule.selectorText;
</del><ins>+ if (matchedSelectorText.includes(pseudoElement.selectorText) || !ownerRule.selectorIsGreater(pseudoElement.style.ownerRule.selectors))
+ pseudoElement.lastMatchingSelector = matchedSelectorText;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>