Changeset 56237 in webkit

Timestamp:

Mar 19, 2010 6:35:09 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

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

Reviewed by Timothy Hatcher.

Web Inspector: editing shorthands does not always work.

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

• inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::applyStyleText): (WebCore::InspectorDOMAgent::populateObjectWithStyleProperties): (WebCore::InspectorDOMAgent::shorthandValue):
• inspector/InspectorDOMAgent.h:
• inspector/front-end/StylesSidebarPane.js: (WebInspector.StylePropertyTreeElement.prototype):
• inspector/front-end/inspector.css: (.section .properties li.disabled .enabled-button):
• inspector/front-end/inspector.js: (WebInspector.startEditing.editingCommitted):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (7 diffs)
• inspector/InspectorDOMAgent.h (modified) (1 diff)
• inspector/front-end/StylesSidebarPane.js (modified) (2 diffs)
• inspector/front-end/inspector.css (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-19  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: editing shorthands does not always work.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36362
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::applyStyleText):
+        (WebCore::InspectorDOMAgent::populateObjectWithStyleProperties):
+        (WebCore::InspectorDOMAgent::shorthandValue):
+        * inspector/InspectorDOMAgent.h:
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylePropertyTreeElement.prototype):
+        * inspector/front-end/inspector.css:
+        (.section .properties li.disabled .enabled-button):
+        * inspector/front-end/inspector.js:
+        (WebInspector.startEditing.editingCommitted):
+
 2010-03-19  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/WebCore/inspector/InspectorDOMAgent.cpp

@@ -795 +795 @@
     int styleTextLength = styleText.length();
 
-    // Create a new element to parse the user input CSS.
-    ExceptionCode ec = 0;
-    RefPtr<Element> parseElement = mainFrameDocument()->createElement("span", ec);
-    if (!ec)
-        parseElement->setAttribute("style", styleText, ec);
-    if (ec) {
-        m_frontend->didApplyStyleText(callId, false, ScriptValue::undefined(), m_frontend->newScriptArray());
-        return;
-    }
-
-    CSSStyleDeclaration* tempStyle = parseElement->style();
-    if ((tempStyle && tempStyle->length()) || !styleTextLength) {
+    RefPtr<CSSMutableStyleDeclaration> tempMutableStyle = CSSMutableStyleDeclaration::create();
+    tempMutableStyle->parseDeclaration(styleText);
+    CSSStyleDeclaration* tempStyle = static_cast<CSSStyleDeclaration*>(tempMutableStyle.get());
+
+    if (tempStyle->length() || !styleTextLength) {
         ExceptionCode ec = 0;
         // The input was parsable or the user deleted everything, so remove the
@@ -813 +806 @@
         if (style->getPropertyShorthand(propertyName).isEmpty()) {
             Vector<String> longhandProps = longhandProperties(style, propertyName);
-            for (unsigned i = 0; i < longhandProps.size(); ++i)
+            for (unsigned i = 0; !ec && i < longhandProps.size(); ++i)
                 style->removeProperty(longhandProps[i], ec);
         } else
@@ -841 +834 @@
     Vector<String> changedProperties;
 
-    Vector<String> uniqueProperties = uniqueStyleProperties(tempStyle);
-    for (unsigned i = 0; i < uniqueProperties.size(); ++i) {
-        String name = uniqueProperties[i];
+    for (unsigned i = 0; i < tempStyle->length(); ++i) {
+        String name = tempStyle->item(i);
         String shorthand = tempStyle->getPropertyShorthand(name);
 
@@ -852 +844 @@
         String priority;
         if (!shorthand.isEmpty()) {
-            value = tempStyle->getPropertyValue(shorthand);
+            value = shorthandValue(tempStyle, shorthand);
             priority = shorthandPriority(tempStyle, shorthand);
             foundShorthands.add(shorthand);
@@ -1063 +1055 @@
         if (!shorthand.isEmpty() && !foundShorthands.contains(shorthand)) {
             foundShorthands.add(shorthand);
-            shorthandValues.set(shorthand, style->getPropertyValue(shorthand));
+            shorthandValues.set(shorthand, shorthandValue(style, shorthand));
         }
         property.set("value", style->getPropertyValue(name));
@@ -1118 +1110 @@
 }
 
-Vector<String> InspectorDOMAgent::uniqueStyleProperties(CSSStyleDeclaration* style)
-{
-    Vector<String> properties;
-    HashSet<String> foundProperties;
-
-    for (unsigned i = 0; i < style->length(); ++i) {
-        String property = style->item(i);
-        if (foundProperties.contains(property))
-            continue;
-        foundProperties.add(property);
-        properties.append(property);
-    }
-    return properties;
-}
-
 Vector<String> InspectorDOMAgent::longhandProperties(CSSStyleDeclaration* style, const String& shorthandProperty)
 {
@@ -1147 +1124 @@
 
     return properties;
+}
+
+String InspectorDOMAgent::shorthandValue(CSSStyleDeclaration* style, const String& shorthandProperty)
+{
+    String value = style->getPropertyValue(shorthandProperty);
+    if (value.isEmpty()) {
+        // Some shorthands (like border) return a null value, so compute a shorthand value.
+        // FIXME: remove this when http://bugs.webkit.org/show_bug.cgi?id=15823 is fixed.
+        for (unsigned i = 0; i < style->length(); ++i) {
+            String individualProperty = style->item(i);
+            if (style->getPropertyShorthand(individualProperty) != shorthandProperty)
+                continue;
+            if (style->isPropertyImplicit(individualProperty))
+                continue;
+            String individualValue = style->getPropertyValue(individualProperty);
+            if (individualValue == "initial")
+                continue;
+            if (value.length())
+                value.append(" ");
+            value.append(individualValue);
+        }
+    }
+    return value;
 }
 

trunk/WebCore/inspector/InspectorDOMAgent.h

@@ -162 +162 @@
         ScriptObject buildObjectForRule(CSSStyleRule*);
         ScriptObject buildObjectForStyleSheet(CSSStyleSheet*);
-        Vector<String> uniqueStyleProperties(CSSStyleDeclaration*);
         Vector<String> longhandProperties(CSSStyleDeclaration*, const String& shorthandProperty);
+        String shorthandValue(CSSStyleDeclaration*, const String& shorthandProperty);
         String shorthandPriority(CSSStyleDeclaration*, const String& shorthandProperty);
         bool ruleAffectsNode(CSSStyleRule*, Node*);

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

@@ -1381 +1381 @@
         var section = this.treeOutline.section;
         var elementsPanel = WebInspector.panels.elements;
-        var styleTextLength = styleText.trim().length;
+        styleText = styleText.replace(/\s/g, " ").trim(); // replace   with whitespace.
+        var styleTextLength = styleText.length;
         if (!styleTextLength && updateInterface) {
             if (this._newProperty) {
@@ -1427 +1428 @@
                 self.updateAll(true);
         }
-        InspectorBackend.applyStyleText(WebInspector.Callback.wrap(callback), this.style.id, styleText.trim(), this.name);
+        InspectorBackend.applyStyleText(WebInspector.Callback.wrap(callback), this.style.id, styleText, this.name);
     }
 }

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

@@ -1573 +1573 @@
 }
 
+.section .properties li.disabled .enabled-button {
+    display: block;
+}
+
 .section .properties .name, .event-properties .name {
     color: rgb(136, 19, 145);