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

Timestamp:

Sep 19, 2013, 4:03:32 AM (12 years ago)

Author:

[email protected]

Message:

CSS Unit vmax and vmin in border-width not handled.
​https://bugs.webkit.org/show_bug.cgi?id=121421

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

Source/WebCore:

Border properties were not applied incase its values
were given in vmax/vmin units.

Tests: fast/css/viewport-vmax-border.html

fast/css/viewport-vmin-border.html

• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::computeLengthDouble):

• css/CSSPrimitiveValue.h:

(WebCore::CSSPrimitiveValue::isViewportPercentageMax):
(WebCore::CSSPrimitiveValue::isViewportPercentageMin):

• css/DeprecatedStyleBuilder.cpp:

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

LayoutTests:

• fast/css/viewport-vmax-border-expected.txt: Added.
• fast/css/viewport-vmax-border.html: Added.
• fast/css/viewport-vmin-border-expected.txt: Added.
• fast/css/viewport-vmin-border.html: Added.

Added new tests for verifying that border properties are
applied when its values are given in vmax/vmin units.

File:

• trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (modified) (1 diff)

trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

@@ -616 +616 @@
                     length = 1.0;
             }
-            if (primitiveValue->isViewportPercentageHeight())
-                length = styleResolver->document().renderView()->viewportSize().height() * length / 100.0f;
-            else if (primitiveValue->isViewportPercentageWidth())
-                length = styleResolver->document().renderView()->viewportSize().width() * length / 100.0f;
+            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);
+            }
         } else {
             ASSERT_NOT_REACHED();