Changeset 117958 in webkit

Timestamp:

May 22, 2012 5:22:10 AM (12 years ago)

Author:

apavlov@chromium.org

Message:

Web Inspector: [Styles] Odd synthetic shorthands may appear in the style
​https://bugs.webkit.org/show_bug.cgi?id=87081

Reviewed by Vsevolod Vlasov.

Source/WebCore:

• inspector/front-end/StylesSidebarPane.js:

(WebInspector.StylePropertiesSection.prototype.onpopulate):

LayoutTests:

• inspector/elements/elements-panel-styles-expected.txt:
• inspector/elements/resources/elements-panel-styles.css:

(.foo):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/elements/elements-panel-styles-expected.txt (modified) (6 diffs)
• LayoutTests/inspector/elements/resources/elements-panel-styles.css (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/StylesSidebarPane.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-22  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [Styles] Odd synthetic shorthands may appear in the style
+        https://bugs.webkit.org/show_bug.cgi?id=87081
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/elements/elements-panel-styles-expected.txt:
+        * inspector/elements/resources/elements-panel-styles.css:
+        (.foo):
+
 2012-05-22  Hayato Ito  <hayato@chromium.org>
 

trunk/LayoutTests/inspector/elements/elements-panel-styles-expected.txt

@@ -11 +11 @@
     .foo - 5px elements-panel-styles.css:14
 color: blue;
-    .foo, .foo::before - blue elements-panel-styles.css:21
+    .foo, .foo::before - blue elements-panel-styles.css:22
     /-- overloaded --/ .foo - black elements-panel-styles.css:14
 display: none;
@@ -27 +27 @@
     .foo - 2px elements-panel-styles.css:14
 margin-left: 0px;
-    .foo - 0px elements-panel-styles.css:14
+    .foo - 1px elements-panel-styles.css:14
 margin-right: 0px;
     .foo - 0px elements-panel-styles.css:14
@@ -45 +45 @@
 
 [expanded] 
-.foo  { (elements-panel-styles.css:39)
+.foo  { (elements-panel-styles.css:40)
 
 [expanded] 
-.foo, .foo::before  { (elements-panel-styles.css:21)
+.foo, .foo::before  { (elements-panel-styles.css:22)
 content: "[before Foo]";
 color: blue;
@@ -55 +55 @@
 .foo  { (elements-panel-styles.css:14)
 /-- overloaded --/ color: black;
+margin-left: 1px;
 margin: 10px 0 2px;
+    margin-left: 1px;
     margin-top: 10px;
     margin-right: 0px;
     margin-bottom: 2px;
-    margin-left: 0px;
 border-radius: 5px;
     border-top-left-radius: 5px;
@@ -89 +90 @@
 ======== Pseudo ::before element ========
 [expanded] 
-.foo::before  { (elements-panel-styles.css:43)
+.foo::before  { (elements-panel-styles.css:44)
 
 [expanded] 
-.foo::before  { (elements-panel-styles.css:26)
+.foo::before  { (elements-panel-styles.css:27)
 color: red;
 
 [expanded] 
-.foo, .foo::before  { (elements-panel-styles.css:21)
+.foo, .foo::before  { (elements-panel-styles.css:22)
 content: "[before Foo]";
 /-- overloaded --/ color: blue;
@@ -103 +104 @@
 ======== Pseudo ::after element ========
 [expanded] 
-.foo::after  { (elements-panel-styles.css:34)
+.foo::after  { (elements-panel-styles.css:35)
 font-family: courier;
 content: "[after Foo 2]";
 
 [expanded] 
-.foo::after  { (elements-panel-styles.css:30)
+.foo::after  { (elements-panel-styles.css:31)
 /-- overloaded --/ content: "[after Foo]";
 color: green;

trunk/LayoutTests/inspector/elements/resources/elements-panel-styles.css

@@ -14 +14 @@
 .foo {
     color: black;
+    margin-left: 1px;
     margin: 10px 0 2px;
     border-radius: 5px;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-22  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: [Styles] Odd synthetic shorthands may appear in the style
+        https://bugs.webkit.org/show_bug.cgi?id=87081
+
+        Reviewed by Vsevolod Vlasov.
+
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylePropertiesSection.prototype.onpopulate):
+
 2012-05-22  Hayato Ito  <hayato@chromium.org>
 

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

@@ -1141 +1141 @@
         for (var i = 0; i < this.uniqueProperties.length; ++i) {
             var property = this.uniqueProperties[i];
-            var disabled = property.disabled;
-            var shorthand = !disabled ? property.shorthand : null;
-
-            if (shorthand && shorthand in handledProperties)
-                continue;
+            var shorthand = !property.disabled && !property.inactive ? property.shorthand : null;
 
             if (shorthand) {
-                property = style.getLiveProperty(shorthand);
-                if (!property)
+                if (shorthand in handledProperties)
+                    continue;
+                // We should only create synthetic shorthands if they are not present in the style source (i.e. we are dealing with a source-less style).
+                if (!style.getLiveProperty(shorthand))
                     property = new WebInspector.CSSProperty(style, style.allProperties.length, shorthand, style.getShorthandValue(shorthand), style.getShorthandPriority(shorthand), "style", true, true, "", undefined);
+                else
+                    shorthand = null;
             }
 
@@ -1158 +1158 @@
 
             var isShorthand = !!(property.isLive && (shorthand || shorthandNames[property.name]));
+            if (isShorthand && (property.name in handledProperties))
+                continue;
             var inherited = this.isPropertyInherited(property.name);
             var overloaded = this.isPropertyOverloaded(property.name, isShorthand);