Changeset 196597 in webkit

Timestamp:

Feb 15, 2016 1:37:10 PM (8 years ago)

Author:

timothy@apple.com

Message:

Web Inspector: Show inherited CSS variables in the Style sidebar
​https://bugs.webkit.org/show_bug.cgi?id=154215
rdar://problem/24644058

Reviewed by Joseph Pecoraro.

• UserInterface/Models/CSSProperty.js:

(WebInspector.CSSProperty.isInheritedPropertyName): Added.
(WebInspector.CSSProperty.prototype.update): Use WebInspector.CSSProperty.isInheritedPropertyName.

• UserInterface/Models/DOMNodeStyles.js:

(WebInspector.DOMNodeStyles.prototype._parseStyleDeclarationPayload): Use WebInspector.CSSProperty.isInheritedPropertyName.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/CSSProperty.js (modified) (2 diffs)
• UserInterface/Models/DOMNodeStyles.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-02-15  Timothy Hatcher  <timothy@apple.com>
+
+        Web Inspector: Show inherited CSS variables in the Style sidebar
+        https://bugs.webkit.org/show_bug.cgi?id=154215
+        rdar://problem/24644058
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Models/CSSProperty.js:
+        (WebInspector.CSSProperty.isInheritedPropertyName): Added.
+        (WebInspector.CSSProperty.prototype.update): Use WebInspector.CSSProperty.isInheritedPropertyName.
+        * UserInterface/Models/DOMNodeStyles.js:
+        (WebInspector.DOMNodeStyles.prototype._parseStyleDeclarationPayload): Use WebInspector.CSSProperty.isInheritedPropertyName.
+
 2016-02-15  Timothy Hatcher  <timothy@apple.com>
 

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

@@ -36 +36 @@
     }
 
+    // Static
+
+    static isInheritedPropertyName(name)
+    {
+        console.assert(typeof name === "string");
+        if (name in WebInspector.CSSKeywordCompletions.InheritedProperties)
+            return true;
+        // Check if the name is a CSS variable.
+        return name.startsWith("--");
+    }
+
     // Public
 
@@ -91 +102 @@
         this._implicit = implicit;
         this._anonymous = anonymous;
-        this._inherited = name in WebInspector.CSSKeywordCompletions.InheritedProperties;
+        this._inherited = WebInspector.CSSProperty.isInheritedPropertyName(name);
         this._valid = valid;
         this._styleSheetTextRange = styleSheetTextRange || null;

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

@@ -615 +615 @@
             var propertyPayload = payload.cssProperties[i];
 
-            if (inherited && propertyPayload.name in WebInspector.CSSKeywordCompletions.InheritedProperties)
+            if (inherited && WebInspector.CSSProperty.isInheritedPropertyName(propertyPayload.name))
                 ++inheritedPropertyCount;