Changeset 156466 in webkit for trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

Timestamp:

Sep 26, 2013, 9:57:42 AM (12 years ago)

Author:

[email protected]

Message:

Inset box-shadows fail to round around corners when border-radius is set in vh/vw units.
​https://bugs.webkit.org/show_bug.cgi?id=119187

Patch by Gurpreet Kaur <​[email protected]> on 2013-09-26
Reviewed by Darin Adler.

Source/WebCore:

Border-radius properties were not applied incase its values
were given in vh, vw, vmax, vmin units.

Tests: fast/css/border-radius-inset-box-shadow-viewportlength.html

fast/css/border-radius-viewport-height.html
fast/css/border-radius-viewport-vmax.html
fast/css/border-radius-viewport-vmin.html

• css/DeprecatedStyleBuilder.cpp:

(WebCore::ApplyPropertyBorderRadius::applyValue):
(WebCore::ApplyPropertyComputeLength::applyValue):

• css/StyleResolver.h:

Calculating the border-radius values which has been specified
in viewport units.The vh/vw units are calcultated as percent of
viewport height and viewport width respectively. 1vmax: 1vw or 1vh,
whatever is largest.1vmin: 1vw or 1vh, whatever is smallest.

LayoutTests:

• fast/css/border-radius-inset-box-shadow-viewportlength-expected-mismatch.html: Added.
• fast/css/border-radius-inset-box-shadow-viewportlength.html: Added.
• fast/css/border-radius-viewport-height-expected-mismatch.html: Added.
• fast/css/border-radius-viewport-height.html: Added.
• fast/css/border-radius-viewport-vmax-expected-mismatch.html: Added.
• fast/css/border-radius-viewport-vmax.html: Added.
• fast/css/border-radius-viewport-vmin-expected-mismatch.html: Added.
• fast/css/border-radius-viewport-vmin.html: Added.

Added new tests for verifying that box-shadow and border-radius properties
are applied when its values are viewport units.

File:

• trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -450 +450 @@
             radiusWidth = Length(pair->first()->getDoubleValue(), Percent);
         else if (pair->first()->isViewportPercentageLength())
-            radiusWidth = pair->first()->viewportPercentageLength();
+            radiusWidth = Length(styleResolver->viewportPercentageValue(*pair->first(), pair->first()->getIntValue()), Fixed);
         else if (pair->first()->isCalculatedPercentageWithLength())
             radiusWidth = Length((pair->first()->cssCalcValue()->toCalcValue(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom())));
@@ -458 +458 @@
             radiusHeight = Length(pair->second()->getDoubleValue(), Percent);
         else if (pair->second()->isViewportPercentageLength())
-            radiusHeight = pair->second()->viewportPercentageLength();
+            radiusHeight = Length(styleResolver->viewportPercentageValue(*pair->second(), pair->second()->getIntValue()), Fixed);
         else if (pair->second()->isCalculatedPercentageWithLength())
             radiusHeight = Length((pair->second()->cssCalcValue()->toCalcValue(styleResolver->style(), styleResolver->rootElementStyle(), styleResolver->style()->effectiveZoom())));
@@ -626 +626 @@
                     length = 1.0;
             }
-            if (primitiveValue->isViewportPercentageLength()) { 
-                int viewPortHeight = styleResolver->document().renderView()->viewportSize().height() * length / 100.0f;
-                int viewPortWidth = styleResolver->document().renderView()->viewportSize().width() * length / 100.0f;
-                if (primitiveValue->isViewportPercentageHeight())
-                    length = viewPortHeight;
-                else if (primitiveValue->isViewportPercentageWidth())
-                    length = viewPortWidth;
-                else if (primitiveValue->isViewportPercentageMax())
-                    length = max(viewPortWidth, viewPortHeight);
-                else if (primitiveValue->isViewportPercentageMin())
-                    length = min(viewPortWidth, viewPortHeight);
-            }
+            if (primitiveValue->isViewportPercentageLength())
+                length = styleResolver->viewportPercentageValue(*primitiveValue, length);
         } else {
             ASSERT_NOT_REACHED();