Split CSSPrimitiveValue into CSSPrimitiveValue and CSSIdentifierValue

third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 35 matching lines @@
 #include "core/animation/animatable/AnimatablePath.h"
 #include "core/animation/animatable/AnimatableRepeatable.h"
 #include "core/animation/animatable/AnimatableSVGPaint.h"
 #include "core/animation/animatable/AnimatableShadow.h"
 #include "core/animation/animatable/AnimatableShapeValue.h"
 #include "core/animation/animatable/AnimatableStrokeDasharrayList.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableUnknown.h"
 #include "core/animation/animatable/AnimatableVisibility.h"
 #include "core/css/CSSCalculationValue.h"
+#include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/Length.h"
 #include "platform/LengthBox.h"
 #include "wtf/StdLibExtras.h"
 
 namespace blink {
 
 static PassRefPtr<AnimatableValue> createFromLengthWithZoom(const Length& length, float zoom)
 {
     switch (length.type()) {
     case Fixed:
     case Percent:
     case Calculated:
         return AnimatableLength::create(length, zoom);
     case Auto:
     case MinContent:
     case MaxContent:
     case FillAvailable:
     case FitContent:
-        return AnimatableUnknown::create(CSSPrimitiveValue::create(length, 1));
+        return AnimatableUnknown::create(CSSValue::create(length, 1));
     case MaxSizeNone:
         return AnimatableUnknown::create(CSSValueNone);
     case ExtendToZoom: // Does not apply to elements.
     case DeviceWidth:
     case DeviceHeight:
         NOTREACHED();
         return nullptr;
     }
     NOTREACHED();
     return nullptr;
@@ skipping 95 matching lines @@
 }
 
 inline static PassRefPtr<AnimatableValue> createFromFillSize(const FillSize& fillSize, const ComputedStyle& style)
 {
     switch (fillSize.type) {
     case SizeLength:
         return createFromLengthSize(fillSize.size, style);
     case Contain:
     case Cover:
     case SizeNone:
-        return AnimatableUnknown::create(CSSPrimitiveValue::create(fillSize.type));
+        return AnimatableUnknown::create(CSSIdentifierValue::create(fillSize.type));
     default:
         NOTREACHED();
         return nullptr;
     }
 }
 
 inline static PassRefPtr<AnimatableValue> createFromBackgroundPosition(const Length& length, bool originIsSet, BackgroundEdgeOrigin origin, const ComputedStyle& style)
 {
     if (!originIsSet || origin == LeftEdge || origin == TopEdge)
         return createFromLength(length, style);
@@ skipping 113 matching lines @@
         return createFromFillLayers<CSSPropertyBackgroundImage>(style.backgroundLayers(), style);
     case CSSPropertyBackgroundPositionX:
         return createFromFillLayers<CSSPropertyBackgroundPositionX>(style.backgroundLayers(), style);
     case CSSPropertyBackgroundPositionY:
         return createFromFillLayers<CSSPropertyBackgroundPositionY>(style.backgroundLayers(), style);
     case CSSPropertyBackgroundSize:
         return createFromFillLayers<CSSPropertyBackgroundSize>(style.backgroundLayers(), style);
     case CSSPropertyBaselineShift:
         switch (style.svgStyle().baselineShift()) {
         case BS_SUPER:
-            return AnimatableUnknown::create(CSSPrimitiveValue::createIdentifier(CSSValueSuper));
+            return AnimatableUnknown::create(CSSIdentifierValue::create(CSSValueSuper));
         case BS_SUB:
-            return AnimatableUnknown::create(CSSPrimitiveValue::createIdentifier(CSSValueSub));
+            return AnimatableUnknown::create(CSSIdentifierValue::create(CSSValueSub));
         default:
             return createFromLength(style.baselineShiftValue(), style);
         }
     case CSSPropertyBorderBottomColor:
         return createFromColor(property, style);
     case CSSPropertyBorderBottomLeftRadius:
         return createFromLengthSize(style.borderBottomLeftRadius(), style);
     case CSSPropertyBorderBottomRightRadius:
         return createFromLengthSize(style.borderBottomRightRadius(), style);
     case CSSPropertyBorderBottomWidth:
@@ skipping 21 matching lines @@
     case CSSPropertyBorderTopRightRadius:
         return createFromLengthSize(style.borderTopRightRadius(), style);
     case CSSPropertyBorderTopWidth:
         return createFromDouble(style.borderTopWidth());
     case CSSPropertyBottom:
         return createFromLength(style.bottom(), style);
     case CSSPropertyBoxShadow:
         return AnimatableShadow::create(style.boxShadow(), style.color());
     case CSSPropertyClip:
         if (style.hasAutoClip())
-            return AnimatableUnknown::create(CSSPrimitiveValue::createIdentifier(CSSValueAuto));
+            return AnimatableUnknown::create(CSSIdentifierValue::create(CSSValueAuto));
         return createFromLengthBox(style.clip(), style);
     case CSSPropertyColor:
         return createFromColor(property, style);
     case CSSPropertyFillOpacity:
         return createFromDouble(style.fillOpacity());
     case CSSPropertyFill:
         return AnimatableSVGPaint::create(
             normalizeSVGPaintType(style.svgStyle().fillPaintType()), normalizeSVGPaintType(style.svgStyle().visitedLinkFillPaintType()),
             style.svgStyle().fillPaintColor(), style.svgStyle().visitedLinkFillPaintColor(),
             style.svgStyle().fillPaintUri(), style.svgStyle().visitedLinkFillPaintUri());
@@ skipping 133 matching lines @@
     case CSSPropertyWebkitMaskImage:
         return createFromFillLayers<CSSPropertyWebkitMaskImage>(style.maskLayers(), style);
     case CSSPropertyWebkitMaskPositionX:
         return createFromFillLayers<CSSPropertyWebkitMaskPositionX>(style.maskLayers(), style);
     case CSSPropertyWebkitMaskPositionY:
         return createFromFillLayers<CSSPropertyWebkitMaskPositionY>(style.maskLayers(), style);
     case CSSPropertyWebkitMaskSize:
         return createFromFillLayers<CSSPropertyWebkitMaskSize>(style.maskLayers(), style);
     case CSSPropertyPerspective:
         if (style.perspective() == 0)
-            return AnimatableUnknown::create(CSSPrimitiveValue::createIdentifier(CSSValueNone));
+            return AnimatableUnknown::create(CSSIdentifierValue::create(CSSValueNone));
         return createFromDouble(style.perspective());
     case CSSPropertyPerspectiveOrigin:
         return createFromLengthPoint(style.perspectiveOrigin(), style);
     case CSSPropertyShapeOutside:
         return createFromShapeValue(style.shapeOutside());
     case CSSPropertyShapeMargin:
         return createFromLength(style.shapeMargin(), style);
     case CSSPropertyShapeImageThreshold:
         return createFromDouble(style.shapeImageThreshold());
     case CSSPropertyWebkitTextStrokeColor:
@@ skipping 34 matching lines @@
         return createFromDouble(style.transformOriginZ());
     case CSSPropertyWidows:
         return createFromDouble(style.widows());
     case CSSPropertyWidth:
         return createFromLength(style.width(), style);
     case CSSPropertyWordSpacing:
         return createFromDouble(style.wordSpacing());
     case CSSPropertyVerticalAlign:
         if (style.verticalAlign() == VerticalAlignLength)
             return createFromLength(style.getVerticalAlignLength(), style);
-        return AnimatableUnknown::create(CSSPrimitiveValue::create(style.verticalAlign()));
+        return AnimatableUnknown::create(CSSIdentifierValue::create(style.verticalAlign()));
     case CSSPropertyVisibility:
         return AnimatableVisibility::create(style.visibility());
     case CSSPropertyD:
         return createFromPath(style.svgStyle().d());
     case CSSPropertyCx:
         return createFromLength(style.svgStyle().cx(), style);
     case CSSPropertyCy:
         return createFromLength(style.svgStyle().cy(), style);
     case CSSPropertyX:
         return createFromLength(style.svgStyle().x(), style);
     case CSSPropertyY:
         return createFromLength(style.svgStyle().y(), style);
     case CSSPropertyR:
         return createFromLength(style.svgStyle().r(), style);
     case CSSPropertyRx:
         return createFromLength(style.svgStyle().rx(), style);
     case CSSPropertyRy:
         return createFromLength(style.svgStyle().ry(), style);
     case CSSPropertyZIndex:
         if (style.hasAutoZIndex())
             return AnimatableUnknown::create(CSSValueAuto);
         return createFromDouble(style.zIndex());
     default:
         NOTREACHED();
         return nullptr;
     }
 }
 
 } // namespace blink