Changeset 186717 in webkit

Timestamp:

Jul 11, 2015 3:29:55 PM (9 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Improve runtime of pseudo-element sidebar style ordering
​https://bugs.webkit.org/show_bug.cgi?id=146866

Reviewed by Timothy Hatcher.

• UserInterface/Models/CSSRule.js:

(WebInspector.CSSRule.prototype.update): Determines the most specific selector and saves it to a variable.
(WebInspector.CSSRule.prototype.get mostSpecificSelector): Returns the most specific selector.
(WebInspector.CSSRule.prototype.selectorIsGreater): Compares the most specific selector to a given selector.
(WebInspector.CSSRule.prototype._determineMostSpecificSelector):
Searches through the selector list to find and return the selector that is the most specific.
(WebInspector.CSSRule):

• UserInterface/Views/RulesStyleDetailsPanel.js:

(WebInspector.RulesStyleDetailsPanel.prototype.refresh):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CSSRule.js (modified) (2 diffs)
• UserInterface/Views/RulesStyleDetailsPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-07-11  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Improve runtime of pseudo-element sidebar style ordering
+        https://bugs.webkit.org/show_bug.cgi?id=146866
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Models/CSSRule.js:
+        (WebInspector.CSSRule.prototype.update): Determines the most specific selector and saves it to a variable.
+        (WebInspector.CSSRule.prototype.get mostSpecificSelector): Returns the most specific selector.
+        (WebInspector.CSSRule.prototype.selectorIsGreater): Compares the most specific selector to a given selector.
+        (WebInspector.CSSRule.prototype._determineMostSpecificSelector):
+        Searches through the selector list to find and return the selector that is the most specific.
+        (WebInspector.CSSRule):
+        * UserInterface/Views/RulesStyleDetailsPanel.js:
+        (WebInspector.RulesStyleDetailsPanel.prototype.refresh):
+
 2015-07-11  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/CSSRule.js

@@ -81 +81 @@
         this._selectors = selectors;
         this._matchedSelectorIndices = matchedSelectorIndices;
+        this._mostSpecificSelector = null;
         this._style = style;
         this._mediaList = mediaList;
@@ -183 +184 @@
     }
 
-    selectorIsGreater(otherSelectors)
-    {
-        if (!otherSelectors || !otherSelectors.length)
-            return true;
-
-        var selectorIsGreater = true;
+    get mostSpecificSelector()
+    {
+        if (!this._mostSpecificSelector)
+            this._mostSpecificSelector = this._determineMostSpecificSelector();
+
+        return this._mostSpecificSelector;
+    }
+
+    selectorIsGreater(otherSelector)
+    {
+        var mostSpecificSelector = this.mostSpecificSelector;
+
+        if (!mostSpecificSelector)
+            return false;
+
+        return mostSpecificSelector.isGreaterThan(otherSelector);
+    }
+
+    // Protected
+
+    get nodeStyles()
+    {
+        return this._nodeStyles;
+    }
+
+    // Private
+
+    _determineMostSpecificSelector()
+    {
+        if (!this._selectors || !this._selectors.length)
+            return null;
 
         var selectors = this.matchedSelectors;
+
         if (!selectors.length)
             selectors = this._selectors;
 
+        var specificSelector = selectors[0];
+
         for (var selector of selectors) {
-            for (var otherSelector of otherSelectors) {
-                if (selector.isGreaterThan(otherSelector))
-                    continue;
-
-                selectorIsGreater = false;
-            }
-
-            if (selectorIsGreater)
-                return true;
-        }
-
-        return false;
-    }
-
-    // Protected
-
-    get nodeStyles()
-    {
-        return this._nodeStyles;
+            if (selector.isGreaterThan(specificSelector))
+                specificSelector = selector;
+        }
+
+        return specificSelector;
     }
 };

trunk/Source/WebInspectorUI/UserInterface/Views/RulesStyleDetailsPanel.js

@@ -280 +280 @@
                     }
 
-                    if (matchedSelectorText.includes(pseudoElement.selectorText) || !ownerRule.selectorIsGreater(pseudoElement.style.ownerRule.selectors))
+                    if (matchedSelectorText.includes(pseudoElement.selectorText) || !ownerRule.selectorIsGreater(pseudoElement.style.ownerRule.mostSpecificSelector))
                         pseudoElement.lastMatchingSelector = matchedSelectorText;
                 }