<!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>[187195] 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/187195">187195</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 17:44:09 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: REGRESSION (Safari 7): Pseudo element rules are not labelled with media queries in Styles panel
https://bugs.webkit.org/show_bug.cgi?id=147207
Reviewed by Timothy Hatcher.
* UserInterface/Views/RulesStyleDetailsPanel.js:
(WebInspector.RulesStyleDetailsPanel.prototype.refresh.insertMediaOrInheritanceLabel):
(WebInspector.RulesStyleDetailsPanel.prototype.refresh.insertAllMatchingPseudoStyles):
Now inserts pseudo-styles based on whether their selector specificity is greater than
the previous style's selector specificity.
(WebInspector.RulesStyleDetailsPanel.prototype.refresh):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</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 (187194 => 187195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-07-23 00:04:02 UTC (rev 187194)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-07-23 00:44:09 UTC (rev 187195)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-07-22 Devin Rousso <drousso@apple.com>
+
+ Web Inspector: REGRESSION (Safari 7): Pseudo element rules are not labelled with media queries in Styles panel
+ https://bugs.webkit.org/show_bug.cgi?id=147207
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/RulesStyleDetailsPanel.js:
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh.insertMediaOrInheritanceLabel):
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh.insertAllMatchingPseudoStyles):
+ Now inserts pseudo-styles based on whether their selector specificity is greater than
+ the previous style's selector specificity.
+ (WebInspector.RulesStyleDetailsPanel.prototype.refresh):
+
</ins><span class="cx"> 2015-07-22 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Change syntax highlighting color for regular expressions to make them more readable
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRulesStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js (187194 => 187195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-07-23 00:04:02 UTC (rev 187194)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js 2015-07-23 00:44:09 UTC (rev 187195)
</span><span class="lines">@@ -60,6 +60,16 @@
</span><span class="cx"> var previousMediaList = [];
</span><span class="cx"> var previousSection = null;
</span><span class="cx">
</span><ins>+ var pseudoElements = this.nodeStyles.pseudoElements;
+ var pseudoElementsStyle = [];
+ for (var pseudoIdentifier in pseudoElements)
+ pseudoElementsStyle = pseudoElementsStyle.concat(pseudoElements[pseudoIdentifier].orderedStyles);
+
+ var orderedPseudoStyles = uniqueOrderedStyles(pseudoElementsStyle);
+ // Reverse the array to allow ensure that splicing the array will not mess with the order.
+ if (orderedPseudoStyles.length)
+ orderedPseudoStyles.reverse();
+
</ins><span class="cx"> function mediaListsEqual(a, b)
</span><span class="cx"> {
</span><span class="cx"> a = a || [];
</span><span class="lines">@@ -169,29 +179,8 @@
</span><span class="cx"> addedNewRuleButton = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var pseudoElements = this.nodeStyles.pseudoElements;
- var pseudoElementsStyle = [];
-
- for (var pseudoIdentifier in pseudoElements)
- pseudoElementsStyle = pseudoElementsStyle.concat(pseudoElements[pseudoIdentifier].orderedStyles);
-
- var orderedPseudoStyles = uniqueOrderedStyles(pseudoElementsStyle);
- var pseudoElementSelectors = [];
-
- for (var style of orderedPseudoStyles)
- pseudoElementSelectors.push({ style, selectorText: style.ownerRule.selectorText.replace(/:{1,2}[\w-]+\s*/g, " ").trimRight() });
-
- // Reverse the array to allow ensure that splicing the array will not mess with the order.
- if (pseudoElementSelectors.length)
- pseudoElementSelectors.reverse();
-
- var addedNewRuleButton = false;
- this._ruleMediaAndInherticanceList = [];
-
- var orderedStyles = uniqueOrderedStyles(this.nodeStyles.orderedStyles);
- for (var i = 0; i < orderedStyles.length; ++i) {
- var style = orderedStyles[i];
-
</del><ins>+ function insertMediaOrInheritanceLabel(style)
+ {
</ins><span class="cx"> var hasMediaOrInherited = [];
</span><span class="cx">
</span><span class="cx"> if (style.type === WebInspector.CSSStyleDeclaration.Type.Rule && !addedNewRuleButton)
</span><span class="lines">@@ -222,9 +211,7 @@
</span><span class="cx"> if (previousSection)
</span><span class="cx"> previousSection.lastInGroup = true;
</span><span class="cx">
</span><del>- for (var j = 0; j < currentMediaList.length; ++j) {
- var media = currentMediaList[j];
-
</del><ins>+ for (var media of currentMediaList) {
</ins><span class="cx"> var prefixElement = document.createElement("strong");
</span><span class="cx"> prefixElement.textContent = WebInspector.UIString("Media: ");
</span><span class="cx">
</span><span class="lines">@@ -262,36 +249,55 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> this._ruleMediaAndInherticanceList.push(hasMediaOrInherited);
</span><ins>+ }
</ins><span class="cx">
</span><del>- var ownerRule = style.ownerRule;
</del><ins>+ function insertAllMatchingPseudoStyles(force)
+ {
+ if (!orderedPseudoStyles.length)
+ return;
</ins><span class="cx">
</span><del>- if (pseudoElementSelectors.length && ownerRule) {
- for (var j = pseudoElementSelectors.length - 1; j >= 0; --j) {
- var pseudoElement = pseudoElementSelectors[j];
- var matchedSelectorText = ownerRule.matchedSelectorText;
</del><ins>+ if (force) {
+ for (var j = orderedPseudoStyles.length - 1; j >= 0; --j) {
+ var pseudoStyle = orderedPseudoStyles[j];
+ insertMediaOrInheritanceLabel.call(this, pseudoStyle);
+ appendStyleSection.call(this, pseudoStyle);
+ }
+ orderedPseudoStyles = [];
+ }
</ins><span class="cx">
</span><del>- if (ownerRule.type === WebInspector.CSSRule.Type.UserAgent || style.inerhited
- || (pseudoElement.lastMatchingSelector && pseudoElement.lastMatchingSelector !== matchedSelectorText)) {
- appendStyleSection.call(this, pseudoElement.style);
- pseudoElementSelectors.splice(j, 1);
- this._ruleMediaAndInherticanceList.push(hasMediaOrInherited);
</del><ins>+ if (!previousSection)
+ return;
</ins><span class="cx">
</span><del>- continue;
- }
</del><ins>+ var ownerRule = previousSection.style.ownerRule;
+ if (!ownerRule)
+ return;
</ins><span class="cx">
</span><del>- if (matchedSelectorText.includes(pseudoElement.selectorText) || !ownerRule.selectorIsGreater(pseudoElement.style.ownerRule.mostSpecificSelector))
- pseudoElement.lastMatchingSelector = matchedSelectorText;
- }
</del><ins>+ for (var j = orderedPseudoStyles.length - 1; j >= 0; --j) {
+ var pseudoStyle = orderedPseudoStyles[j];
+ if (!pseudoStyle.ownerRule.selectorIsGreater(ownerRule.mostSpecificSelector))
+ continue;
+
+ insertMediaOrInheritanceLabel.call(this, pseudoStyle);
+ appendStyleSection.call(this, pseudoStyle);
+ ownerRule = pseudoStyle.ownerRule;
+ orderedPseudoStyles.splice(j, 1);
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><ins>+ var addedNewRuleButton = false;
+ this._ruleMediaAndInherticanceList = [];
+
+ var orderedStyles = uniqueOrderedStyles(this.nodeStyles.orderedStyles);
+ for (var style of orderedStyles) {
+ var isUserAgentStyle = style.ownerRule && style.ownerRule.type === WebInspector.CSSRule.Type.UserAgent;
+ insertAllMatchingPseudoStyles.call(this, isUserAgentStyle || style.inerhited);
+
+ insertMediaOrInheritanceLabel.call(this, style);
</ins><span class="cx"> appendStyleSection.call(this, style);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Just in case there are any pseudo-selectors left that haven't been added.
</span><del>- if (pseudoElementSelectors.length) {
- for (var i = pseudoElementSelectors.length - 1; i >= 0; --i)
- appendStyleSection.call(this, pseudoElementSelectors[i].style);
- }
</del><ins>+ insertAllMatchingPseudoStyles.call(this, true);
</ins><span class="cx">
</span><span class="cx"> if (!addedNewRuleButton)
</span><span class="cx"> addNewRuleButton.call(this);
</span></span></pre>
</div>
</div>
</body>
</html>