Changeset 169248 in webkit

Timestamp:

May 22, 2014, 10:18:23 PM (11 years ago)

Author:

Simon Fraser

Message:

Make viewport units work in CSS gradients
​https://bugs.webkit.org/show_bug.cgi?id=133204
<rdar://problem/17012259>

Source/WebCore:

Reviewed by Tim Horton.

Make viewport percentage lengths work in gradients.

Test: fast/gradients/viewport-units-gradient.html

• css/CSSGradientValue.cpp:

(WebCore::CSSGradientValue::addStops):
(WebCore::CSSLinearGradientValue::createGradient):
(WebCore::CSSRadialGradientValue::createGradient):

• css/CSSGradientValue.h:

LayoutTests:

Reviewed by Tim Horton.

Make viewport percentage lengths work in gradients.

• fast/gradients/viewport-units-gradient-expected.html: Added.
• fast/gradients/viewport-units-gradient.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/gradients/viewport-units-gradient-expected.html (added)
• LayoutTests/fast/gradients/viewport-units-gradient.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSGradientValue.cpp (modified) (5 diffs)
• Source/WebCore/css/CSSGradientValue.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-05-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Make viewport units work in CSS gradients
+        https://bugs.webkit.org/show_bug.cgi?id=133204
+        <rdar://problem/17012259>
+
+        Reviewed by Tim Horton.
+
+        Make viewport percentage lengths work in gradients.
+
+        * fast/gradients/viewport-units-gradient-expected.html: Added.
+        * fast/gradients/viewport-units-gradient.html: Added.
+
 2014-05-22  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-05-22  Simon Fraser  <simon.fraser@apple.com>
+
+        Make viewport units work in CSS gradients
+        https://bugs.webkit.org/show_bug.cgi?id=133204
+        <rdar://problem/17012259>
+        
+        Reviewed by Tim Horton.
+        
+        Make viewport percentage lengths work in gradients.
+
+        Test: fast/gradients/viewport-units-gradient.html
+
+        * css/CSSGradientValue.cpp:
+        (WebCore::CSSGradientValue::addStops):
+        (WebCore::CSSLinearGradientValue::createGradient):
+        (WebCore::CSSRadialGradientValue::createGradient):
+        * css/CSSGradientValue.h:
+
 2014-05-22  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/css/CSSGradientValue.cpp

@@ -130 +130 @@
 }
 
-void CSSGradientValue::addStops(Gradient* gradient, const CSSToLengthConversionData& conversionData, float maxLengthForRepeat)
+void CSSGradientValue::addStops(Gradient* gradient, RenderView* renderView, const CSSToLengthConversionData& conversionData, float maxLengthForRepeat)
 {
     if (m_gradientType == CSSDeprecatedLinearGradient || m_gradientType == CSSDeprecatedRadialGradient) {
@@ -172 +172 @@
 
         if (stop.m_position) {
-            if (stop.m_position->isPercentage())
-                stops[i].offset = stop.m_position->getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE) / 100;
-            else if (stop.m_position->isLength() || stop.m_position->isCalculatedPercentageWithLength()) {
+            const CSSPrimitiveValue& positionValue = *stop.m_position;
+            if (positionValue.isPercentage())
+                stops[i].offset = positionValue.getFloatValue(CSSPrimitiveValue::CSS_PERCENTAGE) / 100;
+            else if (positionValue.isLength() || positionValue.isViewportPercentageLength() || positionValue.isCalculatedPercentageWithLength()) {
                 if (!computedGradientLength) {
                     FloatSize gradientSize(gradientStart - gradientEnd);
@@ -180 +181 @@
                 }
                 float length;
-                if (stop.m_position->isLength())
-                    length = stop.m_position->computeLength<float>(conversionData);
+                if (positionValue.isLength())
+                    length = positionValue.computeLength<float>(conversionData);
+                else if (positionValue.isViewportPercentageLength())
+                    length = valueForLength(positionValue.viewportPercentageLength(), 0, renderView);
                 else {
-                    Ref<CalculationValue> calculationValue { stop.m_position->cssCalcValue()->createCalculationValue(conversionData) };
+                    Ref<CalculationValue> calculationValue { positionValue.cssCalcValue()->createCalculationValue(conversionData) };
                     length = calculationValue->evaluate(gradientLength);
                 }
@@ -702 +705 @@
 
     // Now add the stops.
-    addStops(gradient.get(), conversionData, 1);
+    addStops(gradient.get(), &renderer->view(), conversionData, 1);
 
     return gradient.release();
@@ -1116 +1119 @@
 
     // Now add the stops.
-    addStops(gradient.get(), conversionData, maxExtent);
+    addStops(gradient.get(), &renderer->view(), conversionData, maxExtent);
 
     return gradient.release();

trunk/Source/WebCore/css/CSSGradientValue.h

@@ -36 +36 @@
 class FloatPoint;
 class Gradient;
+class RenderView;
 
 enum CSSGradientType {
@@ -110 +111 @@
     }
 
-    void addStops(Gradient*, const CSSToLengthConversionData&, float maxLengthForRepeat = 0);
+    void addStops(Gradient*, RenderView*, const CSSToLengthConversionData&, float maxLengthForRepeat = 0);
 
     // Resolve points/radii to front end values.