Changeset 56697 in webkit

Timestamp:

Mar 28, 2010 10:41:20 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-03-28 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Toggling style properties on/off does not always work.

​https://bugs.webkit.org/show_bug.cgi?id=36720

• inspector/InspectorController.cpp:
• inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::toggleStyleEnabled): (WebCore::InspectorDOMAgent::buildObjectForStyle): (WebCore::InspectorDOMAgent::buildArrayForDisabledStyleProperties):
• inspector/InspectorDOMAgent.h:
• inspector/front-end/DOMAgent.js: (WebInspector.CSSStyleDeclaration):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (3 diffs)
• inspector/InspectorDOMAgent.h (modified) (3 diffs)
• inspector/front-end/DOMAgent.js (modified) (1 diff)
• inspector/front-end/StylesSidebarPane.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-28  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Toggling style properties on/off does not always work.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36720
+
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::toggleStyleEnabled):
+        (WebCore::InspectorDOMAgent::buildObjectForStyle):
+        (WebCore::InspectorDOMAgent::buildArrayForDisabledStyleProperties):
+        * inspector/InspectorDOMAgent.h:
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.CSSStyleDeclaration):
+
 2010-03-28  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -59 +59 @@
 #include "InspectorClient.h"
 #include "InspectorFrontendClient.h"
-#include "InspectorDOMAgent.h"
 #include "InspectorDOMStorageResource.h"
 #include "InspectorDatabaseResource.h"

trunk/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1002 +1002 @@
     CSSStyleDeclaration* style = it->second.get();
 
-    IdToStyleMap::iterator disabledIt = m_idToDisabledStyle.find(styleId);
+    IdToDisabledStyleMap::iterator disabledIt = m_idToDisabledStyle.find(styleId);
     if (disabledIt == m_idToDisabledStyle.end())
-        disabledIt = m_idToDisabledStyle.set(styleId, CSSMutableStyleDeclaration::create()).first;
-    CSSStyleDeclaration* disabledStyle = disabledIt->second.get();
+        disabledIt = m_idToDisabledStyle.set(styleId, DisabledStyleDeclaration()).first;
 
     // TODO: make sure this works with shorthands right.
     ExceptionCode ec = 0;
     if (disabled) {
-        disabledStyle->setProperty(propertyName, style->getPropertyValue(propertyName), style->getPropertyPriority(propertyName), ec);
+        disabledIt->second.set(propertyName, std::make_pair(style->getPropertyValue(propertyName), style->getPropertyPriority(propertyName)));
         if (!ec)
             style->removeProperty(propertyName, ec);
-    } else {
-        style->setProperty(propertyName, disabledStyle->getPropertyValue(propertyName), disabledStyle->getPropertyPriority(propertyName), ec);
+    } else if (disabledIt->second.contains(propertyName)) {
+        PropertyValueAndPriority valueAndPriority = disabledIt->second.get(propertyName);
+        style->setProperty(propertyName, valueAndPriority.first, valueAndPriority.second, ec);
         if (!ec)
-            disabledStyle->removeProperty(propertyName, ec);
+            disabledIt->second.remove(propertyName);
     }
     if (ec) {
@@ -1129 +1129 @@
         result.set("id", styleId);
 
-        IdToStyleMap::iterator disabledIt = m_idToDisabledStyle.find(styleId);
-        if (disabledIt != m_idToDisabledStyle.end()) {
-            ScriptObject disabledStyle = m_frontend->newScriptObject();
-            populateObjectWithStyleProperties(disabledIt->second.get(), disabledStyle);
-            result.set("disabled", disabledStyle);
-        }
+        IdToDisabledStyleMap::iterator disabledIt = m_idToDisabledStyle.find(styleId);
+        if (disabledIt != m_idToDisabledStyle.end())
+            result.set("disabled", buildArrayForDisabledStyleProperties(disabledIt->second));
     }
     result.set("width", style->getPropertyValue("width"));
@@ -1165 +1162 @@
         properties.set(i, property);
     }
+}
+
+ScriptArray InspectorDOMAgent::buildArrayForDisabledStyleProperties(DisabledStyleDeclaration& declaration)
+{
+    int counter = 0;
+    ScriptArray properties = m_frontend->newScriptArray();
+    for (DisabledStyleDeclaration::iterator it = declaration.begin(); it != declaration.end(); ++it) {
+        ScriptObject property = m_frontend->newScriptObject();
+        property.set("name", it->first);
+        property.set("value", it->second.first);
+        property.set("priority", it->second.second);
+        properties.set(counter++, property);
+    }
+    return properties;
 }
 

trunk/WebCore/inspector/InspectorDOMAgent.h

@@ -127 +127 @@
         void pushChildNodesToFrontend(long nodeId);
 
-   private:
+    private:
+        typedef std::pair<String, String> PropertyValueAndPriority;
+        typedef HashMap<String, PropertyValueAndPriority> DisabledStyleDeclaration;
+
         void startListening(Document* document);
         void stopListening(Document* document);
@@ -165 +168 @@
         ScriptObject buildObjectForStyle(CSSStyleDeclaration*, bool bind);
         void populateObjectWithStyleProperties(CSSStyleDeclaration*, ScriptObject& result);
+        ScriptArray buildArrayForDisabledStyleProperties(DisabledStyleDeclaration&);
         ScriptObject buildObjectForRule(CSSStyleRule*);
         ScriptObject buildObjectForStyleSheet(CSSStyleSheet*);
@@ -192 +196 @@
         RuleToIdMap m_ruleToId;
         IdToRuleMap m_idToRule;
-        IdToStyleMap m_idToDisabledStyle;
+        typedef HashMap<long, DisabledStyleDeclaration>  IdToDisabledStyleMap;
+        IdToDisabledStyleMap m_idToDisabledStyle;
         RefPtr<CSSStyleSheet> m_inspectorStyleSheet;
 

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

@@ -496 +496 @@
     this.__disabledPropertyPriorities = {};
     if (payload.disabled) {
-        var disabledProperties = payload.disabled.properties;
-        var shorthandValues = payload.disabled.shorthandValues;
-        for (var name in shorthandValues) {
-            this.__disabledProperties[name] = true;
-            this.__disabledPropertyValues[name] = shorthandValues[name];
-        }
-        for (var i = 0; i < disabledProperties.length; ++i) {
-            var disabledProperty = disabledProperties[i];
-            if (disabledProperty.shorthand)
-                continue;
-            var name = disabledProperty.name;
-            this.__disabledProperties[name] = true;
-            this.__disabledPropertyValues[name] = disabledProperty.value;
-            this.__disabledPropertyPriorities[name] = disabledProperty.priority;
-        }
-    }
-    
+        for (var i = 0; i < payload.disabled.length; ++i) {
+            var property = payload.disabled[i];
+            this.__disabledProperties[property.name] = true;
+            this.__disabledPropertyValues[property.name] = property.value;
+            this.__disabledPropertyPriorities[property.name] = property.priority;
+        }
+    }
+
     this._shorthandValues = payload.shorthandValues;
     this._propertyMap = {};

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

@@ -213 +213 @@
             var attrStyle = { style: new WebInspector.CSSStyleDeclaration(styles.styleAttributes[name]), editable: false };
             attrStyle.subtitle = WebInspector.UIString("element’s “%s” attribute", name);
-            attrStyle.selectorText = node.nodeName + "[" + name;
+            attrStyle.selectorText = WebInspector.panels.elements.treeOutline.nodeNameToCorrectCase(node.nodeName) + "[" + name;
             if (node.getAttribute(name))
                 attrStyle.selectorText += "=" + node.getAttribute(name);