Changeset 14067 in webkit

Timestamp:

Apr 25, 2006 3:35:33 PM (18 years ago)

Author:

bdakin

Message:

Reviewed by Maciej.

Fix for <rdar://problem/4518632> getComputedStyle returns 'auto'
for dimensions like 'margin-left'

• css/CSSComputedStyleDeclaration.cpp: (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): For margin and padding, to match Firefox we now go to the renderer to get the property value instead of calling valueForLength() on the style attribute. valueForLength() will return the string 'auto' if that was what was specified in the CSS, or a percentage if it was specified as a percent. But to match Firefox, we always want to return a pixel value for margin and padding.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/marginComputedStyle-expected.checksum (added)
• LayoutTests/fast/css/marginComputedStyle-expected.png (added)
• LayoutTests/fast/css/marginComputedStyle-expected.txt (added)
• LayoutTests/fast/css/marginComputedStyle.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-04-25  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Maciej.
+
+        Layout test for <rdar://problem/4518632> getComputedStyle returns 
+        'auto' for dimensions like 'margin-left'
+
+        * fast/css/marginComputedStyle-expected.checksum: Added.
+        * fast/css/marginComputedStyle-expected.png: Added.
+        * fast/css/marginComputedStyle-expected.txt: Added.
+        * fast/css/marginComputedStyle.html: Added.
+
 2006-04-26  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-04-25  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Maciej.
+
+        Fix for <rdar://problem/4518632> getComputedStyle returns 'auto' 
+        for dimensions like 'margin-left'
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): For 
+        margin and padding, to match Firefox we now go to the renderer to 
+        get the property value instead of calling valueForLength() on the 
+        style attribute. valueForLength() will return the string 'auto' if 
+        that was what was specified in the CSS, or a percentage if it was 
+        specified as a percent. But to match Firefox, we always want to 
+        return a pixel value for margin and padding.
+
 2006-04-26  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -787 +787 @@
         return 0;
     case CSS_PROP_MARGIN_TOP:
-        return valueForLength(style->marginTop());
+        return new CSSPrimitiveValue(renderer->marginTop(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_MARGIN_RIGHT:
-        return valueForLength(style->marginRight());
+        return new CSSPrimitiveValue(renderer->marginRight(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_MARGIN_BOTTOM:
-        return valueForLength(style->marginBottom());
+        return new CSSPrimitiveValue(renderer->marginBottom(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_MARGIN_LEFT:
-        return valueForLength(style->marginLeft());
+        return new CSSPrimitiveValue(renderer->marginLeft(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP__WEBKIT_MARQUEE:
         // FIXME: unimplemented
@@ -894 +894 @@
         return 0;
     case CSS_PROP_PADDING_TOP:
-        return valueForLength(style->paddingTop());
+        return new CSSPrimitiveValue(renderer->paddingTop(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_PADDING_RIGHT:
-        return valueForLength(style->paddingRight());
+        return new CSSPrimitiveValue(renderer->paddingRight(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_PADDING_BOTTOM:
-        return valueForLength(style->paddingBottom());
+        return new CSSPrimitiveValue(renderer->paddingBottom(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_PADDING_LEFT:
-        return valueForLength(style->paddingLeft());
+        return new CSSPrimitiveValue(renderer->paddingLeft(), CSSPrimitiveValue::CSS_PX);
     case CSS_PROP_PAGE:
         // FIXME: unimplemented