| Index: third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
|
| index ebe7ed42f99edca858375ea8246d892478f94d61..4c4aa618ccff4ce6e8530b0230229ccf1d4af292 100644
|
| --- a/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/css/CSSAnimatableValueFactory.cpp
|
| @@ -31,6 +31,7 @@
|
| #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"
|
| @@ -309,32 +310,6 @@ static PassRefPtr<AnimatableValue> createFromTransformProperties(
|
| 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));
|
| }
|
|
|