Changeset 74045 in webkit

Timestamp:

Dec 14, 2010 11:34:32 AM (13 years ago)

Author:

Beth Dakin

Message:

WebCore: Fix for ​https://bugs.webkit.org/show_bug.cgi?id=50974
getComputedStyle() returns wrong values for zoomed elements when
display is none
-and corresponding-
<rdar://problem/8522731>

Reviewed by Darin Adler.

If there is no renderer but the RenderStyle's value is a fixed
length, send it through zoomAdjustedPixelValue(). There's not much
we can do for other length types without a renderer.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::zoomAdjustedPixelValueForLength):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

LayoutTests: New test for ​https://bugs.webkit.org/show_bug.cgi?id=50974
getComputedStyle() returns wrong values for zoomed elements when
display is none
-and corresponding-
<rdar://problem/8522731>

Reviewed by Darin Adler.

• fast/css/getComputedStyle/zoom-on-display-none-expected.txt: Added.
• fast/css/getComputedStyle/zoom-on-display-none.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/getComputedStyle/zoom-on-display-none-expected.txt (added)
• LayoutTests/fast/css/getComputedStyle/zoom-on-display-none.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-14  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        New test for https://bugs.webkit.org/show_bug.cgi?id=50974 
+        getComputedStyle() returns wrong values for zoomed elements when 
+        display is none
+        -and corresponding-
+        <rdar://problem/8522731>
+
+        * fast/css/getComputedStyle/zoom-on-display-none-expected.txt: Added.
+        * fast/css/getComputedStyle/zoom-on-display-none.html: Added.
+
 2010-12-14  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-14  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Fix for https://bugs.webkit.org/show_bug.cgi?id=50974 
+        getComputedStyle() returns wrong values for zoomed elements when 
+        display is none
+        -and corresponding-
+        <rdar://problem/8522731>
+
+        If there is no renderer but the RenderStyle's value is a fixed 
+        length, send it through zoomAdjustedPixelValue(). There's not much 
+        we can do for other length types without a renderer.
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::zoomAdjustedPixelValueForLength):
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+
 2010-12-13  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -341 +341 @@
 }
 
+static PassRefPtr<CSSValue> zoomAdjustedPixelValueForLength(const Length& length, const RenderStyle* style)
+{
+    if (length.isFixed())
+        return zoomAdjustedPixelValue(length.value(), style);
+    return CSSPrimitiveValue::create(length);
+}
+
 static PassRefPtr<CSSValue> valueForReflection(const StyleReflection* reflection, const RenderStyle* style)
 {
@@ -1063 +1070 @@
             if (renderer)
                 return zoomAdjustedPixelValue(sizingBox(renderer).height(), style.get());
-            return CSSPrimitiveValue::create(style->height());
+            return zoomAdjustedPixelValueForLength(style->height(), style.get());
         case CSSPropertyWebkitHighlight:
             if (style->highlight() == nullAtom)
@@ -1303 +1310 @@
             if (renderer)
                 return zoomAdjustedPixelValue(sizingBox(renderer).width(), style.get());
-            return CSSPrimitiveValue::create(style->width());
+            return zoomAdjustedPixelValueForLength(style->width(), style.get());
         case CSSPropertyWordBreak:
             return CSSPrimitiveValue::create(style->wordBreak());
@@ -1475 +1482 @@
             }
             else {
-                list->append(CSSPrimitiveValue::create(style->perspectiveOriginX()));
-                list->append(CSSPrimitiveValue::create(style->perspectiveOriginY()));
+                list->append(zoomAdjustedPixelValueForLength(style->perspectiveOriginX(), style.get()));
+                list->append(zoomAdjustedPixelValueForLength(style->perspectiveOriginY(), style.get()));
+                
             }
             return list.release();
@@ -1519 +1527 @@
                     list->append(zoomAdjustedPixelValue(style->transformOriginZ(), style.get()));
             } else {
-                list->append(CSSPrimitiveValue::create(style->transformOriginX()));
-                list->append(CSSPrimitiveValue::create(style->transformOriginY()));
+                list->append(zoomAdjustedPixelValueForLength(style->transformOriginX(), style.get()));
+                list->append(zoomAdjustedPixelValueForLength(style->transformOriginY(), style.get()));
                 if (style->transformOriginZ() != 0)
                     list->append(zoomAdjustedPixelValue(style->transformOriginZ(), style.get()));