Changeset 65806 in webkit

Timestamp:

Aug 23, 2010 5:49:37 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-08-23 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Yury Semikhatsky.

Web Inspector: element's css: pseudo-class locations
​https://bugs.webkit.org/show_bug.cgi?id=44344

Also contains a drive-by fix for 44301 (gray out read-only).

• inspector/front-end/StylesSidebarPane.js: (WebInspector.StylesSidebarPane.prototype.update.computedStyleCallback): (WebInspector.StylesSidebarPane.prototype.update): (WebInspector.StylesSidebarPane.prototype._rebuildUpdate): (WebInspector.StylesSidebarPane.prototype._rebuildSectionsForStyleRules): (WebInspector.StylePropertiesSection):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: element's css: pseudo-class locations
+        https://bugs.webkit.org/show_bug.cgi?id=44344
+
+        Also contains a drive-by fix for 44301 (gray out read-only).
+
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylesSidebarPane.prototype.update.computedStyleCallback):
+        (WebInspector.StylesSidebarPane.prototype.update):
+        (WebInspector.StylesSidebarPane.prototype._rebuildUpdate):
+        (WebInspector.StylesSidebarPane.prototype._rebuildSectionsForStyleRules):
+        (WebInspector.StylePropertiesSection):
+
 2010-08-23  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -144 +144 @@
             if (computedStyle)
                 this._refreshUpdate(node, computedStyle, editedSection);
-        };
+        }
 
         if (refresh)
@@ -167 +167 @@
         this.bodyElement.removeChildren();
         this._computedStylePane.bodyElement.removeChildren();
+
         var styleRules = this._rebuildStyleRules(node, styles);
         var usedProperties = {};
@@ -172 +173 @@
         this._markUsedProperties(styleRules, usedProperties, disabledComputedProperties);
         this.sections[0] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, disabledComputedProperties, 0);
+        var anchorElement = this.sections[0].inheritedPropertiesSeparatorElement;
 
         for (var i = 0; i < styles.pseudoElements.length; ++i) {
@@ -190 +192 @@
             disabledComputedProperties = {};
             this._markUsedProperties(styleRules, usedProperties, disabledComputedProperties);
-            this.sections[pseudoId] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, disabledComputedProperties, pseudoId);
+            this.sections[pseudoId] = this._rebuildSectionsForStyleRules(styleRules, usedProperties, disabledComputedProperties, pseudoId, anchorElement);
         }
     },
@@ -243 +245 @@
             var rule = WebInspector.CSSStyleDeclaration.parseRule(styles.matchedCSSRules[i]);
             styleRules.push({ style: rule.style, selectorText: rule.selectorText, parentStyleSheet: rule.parentStyleSheet, rule: rule });
-        }
-
-        // Collect used properties first in order to identify inherited ones.
-        var userPropertyNames = {};
-        for (var i = 0; i < styleRules.length; ++i) {
-            var styleRule = styleRules[i];
-            if (styleRule.computedStyle || styleRule.isStyleSeparator)
-                continue;
-            var style = styleRule.style;
-            for (var j = 0; j < style.length; ++j)
-                userPropertyNames[style[j]] = true;
         }
 
@@ -403 +394 @@
     },
 
-    _rebuildSectionsForStyleRules: function(styleRules, usedProperties, disabledComputedProperties, pseudoId)
+    _rebuildSectionsForStyleRules: function(styleRules, usedProperties, disabledComputedProperties, pseudoId, anchorElement)
     {
         // Make a property section for each style rule.
@@ -417 +408 @@
                     separatorElement.appendChild(document.createTextNode(WebInspector.UIString("Inherited from") + " "));
                     separatorElement.appendChild(link);
+                    if (!sections.inheritedPropertiesSeparatorElement)
+                        sections.inheritedPropertiesSeparatorElement = separatorElement;
                 } else if ("pseudoId" in styleRule) {
                     var pseudoName = WebInspector.StylesSidebarPane.PseudoIdNames[styleRule.pseudoId];
@@ -425 +418 @@
                 } else
                     separatorElement.textContent = styleRule.text;
-                this.bodyElement.appendChild(separatorElement);
+                this.bodyElement.insertBefore(separatorElement, anchorElement);
                 lastWasSeparator = true;
                 continue;
@@ -446 +439 @@
                 lastWasSeparator = true;
             } else {
-                this.bodyElement.appendChild(section.element);
+                this.bodyElement.insertBefore(section.element, anchorElement);
                 lastWasSeparator = false;
             }
@@ -678 +671 @@
     if (this.subtitle)
         this.identifier += ":" + this.subtitle;
+
+    if (!this.editable)
+        this.element.addStyleClass("read-only");
 }
 

trunk/WebCore/inspector/front-end/inspector.css

@@ -4080 +4080 @@
 }
 
+.styles-section.read-only {
+    background-color: rgb(240, 240, 240);
+}
+
 .styles-section .header {
     white-space: nowrap;