Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp

 /*
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 12 matching lines @@
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include "core/css/BasicShapeFunctions.h"
 
 #include "core/css/CSSBasicShapeValues.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSValuePair.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/style/BasicShapes.h"
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
 static CSSValue* valueForCenterCoordinate(const ComputedStyle& style, const BasicShapeCenterCoordinate& center, EBoxOrient orientation)
 {
     if (center.getDirection() == BasicShapeCenterCoordinate::TopLeft)
-        return CSSPrimitiveValue::create(center.length(), style.effectiveZoom());
+        return CSSValue::create(center.length(), style.effectiveZoom());
 
     CSSValueID keyword = orientation == HORIZONTAL ? CSSValueRight : CSSValueBottom;
 
     return CSSValuePair::create(
-        CSSPrimitiveValue::createIdentifier(keyword),
-        CSSPrimitiveValue::create(center.length(), style.effectiveZoom()),
+        CSSIdentifierValue::create(keyword),
+        CSSValue::create(center.length(), style.effectiveZoom()),
         CSSValuePair::DropIdenticalValues);
 }
 
 static CSSValuePair* valueForLengthSize(const LengthSize& lengthSize, const ComputedStyle& style)
 {
     return CSSValuePair::create(
-        CSSPrimitiveValue::create(lengthSize.width(), style.effectiveZoom()),
-        CSSPrimitiveValue::create(lengthSize.height(), style.effectiveZoom()),
+        CSSValue::create(lengthSize.width(), style.effectiveZoom()),
+        CSSValue::create(lengthSize.height(), style.effectiveZoom()),
         CSSValuePair::KeepIdenticalValues);
 }
 
-static CSSPrimitiveValue* basicShapeRadiusToCSSValue(const ComputedStyle& style, const BasicShapeRadius& radius)
+static CSSValue* basicShapeRadiusToCSSValue(const ComputedStyle& style, const BasicShapeRadius& radius)
 {
     switch (radius.type()) {
     case BasicShapeRadius::Value:
-        return CSSPrimitiveValue::create(radius.value(), style.effectiveZoom());
+        return CSSValue::create(radius.value(), style.effectiveZoom());
     case BasicShapeRadius::ClosestSide:
-        return CSSPrimitiveValue::createIdentifier(CSSValueClosestSide);
+        return CSSIdentifierValue::create(CSSValueClosestSide);
     case BasicShapeRadius::FarthestSide:
-        return CSSPrimitiveValue::createIdentifier(CSSValueFarthestSide);
+        return CSSIdentifierValue::create(CSSValueFarthestSide);
     }
 
     ASSERT_NOT_REACHED();
     return nullptr;
 }
 
 CSSValue* valueForBasicShape(const ComputedStyle& style, const BasicShape* basicShape)
 {
     switch (basicShape->type()) {
     case BasicShape::BasicShapeCircleType: {
@@ skipping 65 matching lines @@
 }
 
 static BasicShapeCenterCoordinate convertToCenterCoordinate(const StyleResolverState& state, CSSValue* value)
 {
     BasicShapeCenterCoordinate::Direction direction;
     Length offset = Length(0, Fixed);
 
     CSSValueID keyword = CSSValueTop;
     if (!value) {
         keyword = CSSValueCenter;
-    } else if (value->isPrimitiveValue() && toCSSPrimitiveValue(value)->isValueID()) {
-        keyword = toCSSPrimitiveValue(value)->getValueID();
+    } else if (value->isIdentifierValue()) {
+        keyword = toCSSIdentifierValue(value)->getValueID();
     } else if (value->isValuePair()) {
-        keyword = toCSSPrimitiveValue(toCSSValuePair(value)->first()).getValueID();
+        keyword = toCSSIdentifierValue(toCSSValuePair(value)->first()).getValueID();
         offset = convertToLength(state, &toCSSPrimitiveValue(toCSSValuePair(value)->second()));
     } else {
         offset = convertToLength(state, toCSSPrimitiveValue(value));
     }
 
     switch (keyword) {
     case CSSValueTop:
     case CSSValueLeft:
         direction = BasicShapeCenterCoordinate::TopLeft;
         break;
     case CSSValueRight:
     case CSSValueBottom:
         direction = BasicShapeCenterCoordinate::BottomRight;
         break;
     case CSSValueCenter:
         direction = BasicShapeCenterCoordinate::TopLeft;
         offset = Length(50, Percent);
         break;
     default:
         ASSERT_NOT_REACHED();
         direction = BasicShapeCenterCoordinate::TopLeft;
         break;
     }
 
     return BasicShapeCenterCoordinate(direction, offset);
 }
 
-static BasicShapeRadius cssValueToBasicShapeRadius(const StyleResolverState& state, const CSSPrimitiveValue* radius)
+static BasicShapeRadius cssValueToBasicShapeRadius(const StyleResolverState& state, const CSSValue* radius)
 {
     if (!radius)
         return BasicShapeRadius(BasicShapeRadius::ClosestSide);
 
-    if (radius->isValueID()) {
-        switch (radius->getValueID()) {
+    if (radius->isIdentifierValue()) {
+        switch (toCSSIdentifierValue(radius)->getValueID()) {
         case CSSValueClosestSide:
             return BasicShapeRadius(BasicShapeRadius::ClosestSide);
         case CSSValueFarthestSide:
             return BasicShapeRadius(BasicShapeRadius::FarthestSide);
         default:
             ASSERT_NOT_REACHED();
             break;
         }
     }
 
-    return BasicShapeRadius(convertToLength(state, radius));
+    return BasicShapeRadius(convertToLength(state, toCSSPrimitiveValue(radius)));
 }
 
 PassRefPtr<BasicShape> basicShapeForValue(const StyleResolverState& state, const CSSValue& basicShapeValue)
 {
     RefPtr<BasicShape> basicShape;
 
     if (basicShapeValue.isBasicShapeCircleValue()) {
         const CSSBasicShapeCircleValue& circleValue = toCSSBasicShapeCircleValue(basicShapeValue);
         RefPtr<BasicShapeCircle> circle = BasicShapeCircle::create();
 
@@ skipping 45 matching lines @@
 }
 
 FloatPoint floatPointForCenterCoordinate(const BasicShapeCenterCoordinate& centerX, const BasicShapeCenterCoordinate& centerY, FloatSize boxSize)
 {
     float x = floatValueForLength(centerX.computedLength(), boxSize.width());
     float y = floatValueForLength(centerY.computedLength(), boxSize.height());
     return FloatPoint(x, y);
 }
 
 } // namespace blink