Changeset 208062 in webkit for trunk/Source/WebCore/css/CSSGradientValue.cpp

Timestamp:

Oct 28, 2016, 12:40:44 PM (9 years ago)

Author:

[email protected]

Message:

[CSS Parser] Clean up gradient parsing
​https://bugs.webkit.org/show_bug.cgi?id=164139

Reviewed by Dean Jackson.

• css/CSSGradientValue.cpp:

(WebCore::positionFromValue):
(WebCore::CSSGradientValue::computeEndPoint):

• css/parser/CSSPropertyParserHelpers.cpp:

(WebCore::CSSPropertyParserHelpers::consumeDeprecatedGradient):
(WebCore::CSSPropertyParserHelpers::consumeGradientColorStops):
(WebCore::CSSPropertyParserHelpers::consumeDeprecatedRadialGradient):
(WebCore::CSSPropertyParserHelpers::consumeRadialGradient):
(WebCore::CSSPropertyParserHelpers::consumeLinearGradient):

File:

• trunk/Source/WebCore/css/CSSGradientValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSGradientValue.cpp

@@ -36 +36 @@
 #include "Image.h"
 #include "NodeRenderStyle.h"
+#include "Pair.h"
 #include "RenderElement.h"
 #include "RenderView.h"
@@ -495 +496 @@
 }
 
-static float positionFromValue(CSSPrimitiveValue& value, const CSSToLengthConversionData& conversionData, const FloatSize& size, bool isHorizontal)
-{
-    if (value.isNumber())
-        return value.floatValue() * conversionData.zoom();
-
+static float positionFromValue(const CSSPrimitiveValue* value, const CSSToLengthConversionData& conversionData, const FloatSize& size, bool isHorizontal)
+{
+    int origin = 0;
+    int sign = 1;
     int edgeDistance = isHorizontal ? size.width() : size.height();
-    if (value.isPercentage())
-        return value.floatValue() / 100.f * edgeDistance;
-
-    if (value.isCalculatedPercentageWithLength()) {
-        Ref<CalculationValue> calculationValue { value.cssCalcValue()->createCalculationValue(conversionData) };
-        return calculationValue->evaluate(edgeDistance);
-    }
-
-    switch (value.valueID()) {
+    
+    // In this case the center of the gradient is given relative to an edge in the
+    // form of: [ top | bottom | right | left ] [ <percentage> | <length> ].
+    if (value->isPair()) {
+        CSSValueID originID = value->pairValue()->first()->valueID();
+        value = value->pairValue()->second();
+        
+        if (originID == CSSValueRight || originID == CSSValueBottom) {
+            // For right/bottom, the offset is relative to the far edge.
+            origin = edgeDistance;
+            sign = -1;
+        }
+    }
+    
+    if (value->isNumber())
+        return origin + sign * value->floatValue() * conversionData.zoom();
+    
+    if (value->isPercentage())
+        return origin + sign * value->floatValue() / 100.f * edgeDistance;
+
+    if (value->isCalculatedPercentageWithLength()) {
+        Ref<CalculationValue> calculationValue { value->cssCalcValue()->createCalculationValue(conversionData) };
+        return origin + sign * calculationValue->evaluate(edgeDistance);
+    }
+    
+    switch (value->valueID()) {
     case CSSValueTop:
         ASSERT(!isHorizontal);
@@ -522 +539 @@
         ASSERT(isHorizontal);
         return size.width();
+    case CSSValueCenter:
+        return origin + sign * .5f * edgeDistance;
     default:
         break;
     }
 
-    return value.computeLength<float>(conversionData);
+    return origin + sign * value->computeLength<float>(conversionData);
 }
 
@@ -534 +553 @@
 
     if (horizontal)
-        result.setX(positionFromValue(*horizontal, conversionData, size, true));
+        result.setX(positionFromValue(horizontal, conversionData, size, true));
 
     if (vertical)
-        result.setY(positionFromValue(*vertical, conversionData, size, false));
+        result.setY(positionFromValue(vertical, conversionData, size, false));
 
     return result;