Changeset 138816 in webkit

Timestamp:

Jan 4, 2013 11:02:51 AM (11 years ago)

Author:

mikelawther@chromium.org

Message:

CSS3 calc: mixed percent/absolute for border-radius
​https://bugs.webkit.org/show_bug.cgi?id=106046

Reviewed by Ojan Vafai.

Source/WebCore:

Add the calculation evaluation to the border radius code.

Test: css3/calc/border-radius.html

• css/StyleBuilder.cpp:

(WebCore::ApplyPropertyBorderRadius::applyValue):

LayoutTests:

• css3/calc/border-radius-expected.html: Renamed from LayoutTests/css3/calc/border-radius-expected-mismatch.html.
• css3/calc/border-radius.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/calc/border-radius-expected.html (moved) (moved from trunk/LayoutTests/css3/calc/border-radius-expected-mismatch.html) (1 diff)
• LayoutTests/css3/calc/border-radius.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleBuilder.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-04  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: mixed percent/absolute for border-radius
+        https://bugs.webkit.org/show_bug.cgi?id=106046
+
+        Reviewed by Ojan Vafai.
+
+        * css3/calc/border-radius-expected.html: Renamed from LayoutTests/css3/calc/border-radius-expected-mismatch.html.
+        * css3/calc/border-radius.html:
+
 2013-01-04  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/LayoutTests/css3/calc/border-radius-expected.html

@@ -15 +15 @@
 }
 .both {
-    border-radius:50%;
+    /* Note that 100% is 104px, so 25% + 25px = 51px*/
+    border-radius:51px;
 }
 </style>

trunk/LayoutTests/css3/calc/border-radius.html

@@ -15 +15 @@
 }
 .both {
+    /* Note that 100% is 104px, so 25% + 25px = 51px*/
     border-radius:-webkit-calc(25% + 25px);
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-04  Mike Lawther  <mikelawther@chromium.org>
+
+        CSS3 calc: mixed percent/absolute for border-radius
+        https://bugs.webkit.org/show_bug.cgi?id=106046
+
+        Reviewed by Ojan Vafai.
+
+        Add the calculation evaluation to the border radius code.
+
+        Test: css3/calc/border-radius.html
+
+        * css/StyleBuilder.cpp:
+        (WebCore::ApplyPropertyBorderRadius::applyValue):
+
 2013-01-04  John Mellor  <johnme@chromium.org>
 

trunk/Source/WebCore/css/StyleBuilder.cpp

@@ -448 +448 @@
         else if (pair->first()->isViewportPercentageLength())
             radiusWidth = pair->first()->viewportPercentageLength();
-        else if (pair->first()->isCalculatedPercentageWithLength()) {
-            // FIXME calc(): http://webkit.org/b/16662
-            // handle this case
-            return;
-        } else
+        else if (pair->first()->isCalculatedPercentageWithLength())
+            radiusWidth = Length((pair->first()->cssCalcValue()->toCalcValue(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom())));
+        else
             radiusWidth = pair->first()->computeLength<Length>(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom());
         if (pair->second()->isPercentage())
@@ -458 +456 @@
         else if (pair->second()->isViewportPercentageLength())
             radiusHeight = pair->second()->viewportPercentageLength();
-        else if (pair->second()->isCalculatedPercentageWithLength()) {
-            // FIXME calc(): http://webkit.org/b/16662
-            // handle this case
-            return;
-        } else
+        else if (pair->second()->isCalculatedPercentageWithLength())
+            radiusHeight = Length((pair->second()->cssCalcValue()->toCalcValue(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom())));
+        else
             radiusHeight = pair->second()->computeLength<Length>(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom());
         int width = radiusWidth.value();