Fewer reused duplicate symbol names in animation.

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR 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/animation/css/CSSAnimatableValueFactory.h"
 
 #include "core/CSSValueKeywords.h"
+#include "core/animation/FontWeightConversion.h"
 #include "core/animation/LengthPropertyFunctions.h"
 #include "core/animation/PropertyHandle.h"
 #include "core/animation/animatable/AnimatableClipPathOperation.h"
 #include "core/animation/animatable/AnimatableColor.h"
 #include "core/animation/animatable/AnimatableDouble.h"
 #include "core/animation/animatable/AnimatableDoubleAndBool.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableImage.h"
 #include "core/animation/animatable/AnimatableLength.h"
 #include "core/animation/animatable/AnimatableLengthBox.h"
@@ skipping 258 matching lines @@
 static PassRefPtr<AnimatableValue> createFromTransformProperties(
     PassRefPtr<TransformOperation> transform,
     double zoom,
     PassRefPtr<TransformOperation> initialTransform) {
   TransformOperations operation;
   if (transform || initialTransform)
     operation.operations().push_back(transform ? transform : initialTransform);
   return AnimatableTransform::create(operation, transform ? zoom : 1);
 }
 
-static double fontWeightToDouble(FontWeight fontWeight) {
-  switch (fontWeight) {
-    case FontWeight100:
-      return 100;
-    case FontWeight200:
-      return 200;
-    case FontWeight300:
-      return 300;
-    case FontWeight400:
-      return 400;
-    case FontWeight500:
-      return 500;
-    case FontWeight600:
-      return 600;
-    case FontWeight700:
-      return 700;
-    case FontWeight800:
-      return 800;
-    case FontWeight900:
-      return 900;
-  }
-
-  NOTREACHED();
-  return 400;
-}
-
 static PassRefPtr<AnimatableValue> createFromFontWeight(FontWeight fontWeight) {
   return createFromDouble(fontWeightToDouble(fontWeight));
 }
 
 static SVGPaintType normalizeSVGPaintType(SVGPaintType paintType) {
   // If the <paint> is 'currentColor', then create an AnimatableSVGPaint with
   // a <rgbcolor> type. This is similar in vein to the handling of colors.
   return paintType == SVG_PAINTTYPE_CURRENTCOLOR ? SVG_PAINTTYPE_RGBCOLOR
                                                  : paintType;
 }
@@ skipping 338 matching lines @@
       if (style.hasAutoZIndex())
         return AnimatableUnknown::create(CSSValueAuto);
       return createFromDouble(style.zIndex());
     default:
       NOTREACHED();
       return nullptr;
   }
 }
 
 }  // namespace blink