Changeset 127557 in webkit

Timestamp:

Sep 4, 2012 11:28:26 PM (12 years ago)

Author:

mikelawther@chromium.org

Message:

CSS3 calc: expressions with 'em' units do not zoom correctly.
​https://bugs.webkit.org/show_bug.cgi?id=95705

Reviewed by Ojan Vafai.

Source/WebCore:

Each primitive value in a CSS calc expression now has (zoom) multiplier and scale factor applied
independently. Previously the multiplier and a single scale factor was applied to the expression
as a whole, but this failed to account for expressions involving font relative units. This is
because the multiplier should not be applied to font relative units.

Test: css3/calc/zoom-with-em.html

• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::computeLengthDouble):

LayoutTests:

• css3/calc/zoom-with-em-expected.txt: Added.
• css3/calc/zoom-with-em.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calc/zoom-with-em-expected.txt (added)
• LayoutTests/css3/calc/zoom-with-em.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSPrimitiveValue.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-04  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: expressions with 'em' units do not zoom correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=95705
+
+        Reviewed by Ojan Vafai.
+
+        * css3/calc/zoom-with-em-expected.txt: Added.
+        * css3/calc/zoom-with-em.html: Added.
+
 2012-09-04  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-04  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: expressions with 'em' units do not zoom correctly.
+        https://bugs.webkit.org/show_bug.cgi?id=95705
+
+        Reviewed by Ojan Vafai.
+
+        Each primitive value in a CSS calc expression now has (zoom) multiplier and scale factor applied
+        independently. Previously the multiplier and a single scale factor was applied to the expression
+        as a whole, but this failed to account for expressions involving font relative units. This is 
+        because the multiplier should not be applied to font relative units.
+
+        Test: css3/calc/zoom-with-em.html
+
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::computeLengthDouble):
+
 2012-09-04  Brian Anderson  <brianderson@chromium.org>
 

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -495 +495 @@
 double CSSPrimitiveValue::computeLengthDouble(RenderStyle* style, RenderStyle* rootStyle, float multiplier, bool computingFontSize)
 {
+    if (m_primitiveUnitType == CSS_CALC)
+        // The multiplier and factor is applied to each value in the calc expression individually
+        return m_value.calc->computeLengthPx(style, rootStyle, multiplier, computingFontSize);
+        
     double factor;
 
@@ -541 +545 @@
     }
 
-    double computedValue;
-    if (m_primitiveUnitType == CSS_CALC)
-        // The multiplier is passed in as 1.0 here to ensure it is only applied once
-        computedValue = m_value.calc->computeLengthPx(style, rootStyle, 1.0, computingFontSize);
-    else
-        computedValue = getDoubleValue();
-    
     // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming
     // for font sizes is much more complicated, since we have to worry about enforcing the minimum font size preference
     // as well as enforcing the implicit "smart minimum." In addition the CSS property text-size-adjust is used to
     // prevent text from zooming at all. Therefore we will not apply the zoom here if we are computing font-size.
-    double result = computedValue * factor;
+    double result = getDoubleValue() * factor;
     if (computingFontSize || isFontRelativeLength())
         return result;