Changeset 106809 in webkit

Timestamp:

Feb 6, 2012 8:26:58 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: Remove unused disabledComputedProperties from methods in StylesSidebarPane
​https://bugs.webkit.org/show_bug.cgi?id=77876

Reviewed by Pavel Feldman.

• inspector/front-end/StylesSidebarPane.js:

(WebInspector.StylesSidebarPane.prototype._refreshUpdate):
(WebInspector.StylesSidebarPane.prototype._rebuildUpdate):
(WebInspector.StylesSidebarPane.prototype._markUsedProperties):
(WebInspector.StylesSidebarPane.prototype._refreshSectionsForStyleRules):
(WebInspector.StylesSidebarPane.prototype._rebuildSectionsForStyleRules):
(WebInspector.StylePropertiesSection.prototype.onpopulate):
(WebInspector.ComputedStylePropertiesSection):
(WebInspector.ComputedStylePropertiesSection.prototype._isPropertyInherited):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/StylesSidebarPane.js (modified) (12 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Remove unused disabledComputedProperties from methods in StylesSidebarPane
+        https://bugs.webkit.org/show_bug.cgi?id=77876
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylesSidebarPane.prototype._refreshUpdate):
+        (WebInspector.StylesSidebarPane.prototype._rebuildUpdate):
+        (WebInspector.StylesSidebarPane.prototype._markUsedProperties):
+        (WebInspector.StylesSidebarPane.prototype._refreshSectionsForStyleRules):
+        (WebInspector.StylesSidebarPane.prototype._rebuildSectionsForStyleRules):
+        (WebInspector.StylePropertiesSection.prototype.onpopulate):
+        (WebInspector.ComputedStylePropertiesSection):
+        (WebInspector.ComputedStylePropertiesSection.prototype._isPropertyInherited):
+
 2012-02-06  Alexei Filippov  <alexeif@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/StylesSidebarPane.js

@@ -334 +334 @@
             var styleRules = this._refreshStyleRules(this.sections[pseudoId], computedStyle);
             var usedProperties = {};
-            var disabledComputedProperties = {};
-            this._markUsedProperties(styleRules, usedProperties, disabledComputedProperties);
-            this._refreshSectionsForStyleRules(styleRules, usedProperties, disabledComputedProperties, editedSection);
+            this._markUsedProperties(styleRules, usedProperties);
+            this._refreshSectionsForStyleRules(styleRules, usedProperties, editedSection);
         }
         // Trace the computed style.
@@ -351 +350 @@
         var styleRules = this._rebuildStyleRules(node, styles);
         var usedProperties = {};
-        var disabledComputedProperties = {};
-        this._markUsedProperties(styleRules, usedProperties, disabledComputedProperties);
-        this.sections[0] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, disabledComputedProperties, 0, null);
+        this._markUsedProperties(styleRules, usedProperties);
+        this.sections[0] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, 0, null);
         var anchorElement = this.sections[0].inheritedPropertiesSeparatorElement;
         // Trace the computed style.
@@ -373 +371 @@
             }
             usedProperties = {};
-            disabledComputedProperties = {};
-            this._markUsedProperties(styleRules, usedProperties, disabledComputedProperties);
-            this.sections[pseudoId] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, disabledComputedProperties, pseudoId, anchorElement);
+            this._markUsedProperties(styleRules, usedProperties);
+            this.sections[pseudoId] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, pseudoId, anchorElement);
         }
 
@@ -491 +488 @@
     },
 
-    _markUsedProperties: function(styleRules, usedProperties, disabledComputedProperties)
+    _markUsedProperties: function(styleRules, usedProperties)
     {
         var priorityUsed = false;
@@ -558 +555 @@
     },
 
-    _refreshSectionsForStyleRules: function(styleRules, usedProperties, disabledComputedProperties, editedSection)
+    _refreshSectionsForStyleRules: function(styleRules, usedProperties, editedSection)
     {
         // Walk the style rules and update the sections with new overloaded and used properties.
@@ -565 +562 @@
             var section = styleRule.section;
             if (styleRule.computedStyle) {
-                section._disabledComputedProperties = disabledComputedProperties;
                 section._usedProperties = usedProperties;
                 section.update();
@@ -575 +571 @@
     },
 
-    _rebuildSectionsForStyleRules: function(styleRules, usedProperties, disabledComputedProperties, pseudoId, anchorElement)
+    _rebuildSectionsForStyleRules: function(styleRules, usedProperties, pseudoId, anchorElement)
     {
         // Make a property section for each style rule.
@@ -611 +607 @@
 
             if (computedStyle)
-                var section = new WebInspector.ComputedStylePropertiesSection(styleRule, usedProperties, disabledComputedProperties);
+                var section = new WebInspector.ComputedStylePropertiesSection(styleRule, usedProperties);
             else
                 var section = new WebInspector.StylePropertiesSection(this, styleRule, editable, styleRule.isInherited, lastWasSeparator);
@@ -1054 +1050 @@
             var property = this.uniqueProperties[i];
             var disabled = property.disabled;
-            if (!disabled && this.disabledComputedProperties && !(property.name in this.usedProperties) && property.name in this.disabledComputedProperties)
-                disabled = true;
-
             var shorthand = !disabled ? property.shorthand : null;
 
@@ -1252 +1245 @@
  * @extends {WebInspector.PropertiesSection}
  */
-WebInspector.ComputedStylePropertiesSection = function(styleRule, usedProperties, disabledComputedProperties)
+WebInspector.ComputedStylePropertiesSection = function(styleRule, usedProperties)
 {
     WebInspector.PropertiesSection.call(this, "");
@@ -1259 +1252 @@
     this.styleRule = styleRule;
     this._usedProperties = usedProperties;
-    this._disabledComputedProperties = disabledComputedProperties;
     this._alwaysShowComputedProperties = { "display": true, "height": true, "width": true };
     this.computedStyle = true;
@@ -1274 +1266 @@
     _isPropertyInherited: function(propertyName)
     {
-        return !(propertyName in this._usedProperties) && !(propertyName in this._alwaysShowComputedProperties) && !(propertyName in this._disabledComputedProperties);
+        return !(propertyName in this._usedProperties) && !(propertyName in this._alwaysShowComputedProperties);
     },