| Index: Source/core/animation/EffectInput.cpp
|
| diff --git a/Source/core/animation/EffectInput.cpp b/Source/core/animation/EffectInput.cpp
|
| index d367d057041d281bbb10d9c668eeed5cdc151dbc..a3f0274327d16423d91ac54e3f8b182da9cbc6ae 100644
|
| --- a/Source/core/animation/EffectInput.cpp
|
| +++ b/Source/core/animation/EffectInput.cpp
|
| @@ -58,11 +58,11 @@ PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c
|
| RefPtrWillBeRawPtr<StringKeyframe> keyframe = StringKeyframe::create();
|
|
|
| ScriptValue scriptValue;
|
| - bool frameHasOffset = DictionaryHelper::get(keyframeDictionaryVector[i], "offset", scriptValue) && !scriptValue.isNull();
|
| + bool frameHasOffset = keyframeDictionaryVector[i].get("offset", scriptValue) && !scriptValue.isNull();
|
|
|
| if (frameHasOffset) {
|
| double offset;
|
| - DictionaryHelper::get(keyframeDictionaryVector[i], "offset", offset);
|
| + keyframeDictionaryVector[i].get("offset", offset);
|
|
|
| // Keyframes with offsets outside the range [0.0, 1.0] are an error.
|
| if (std::isnan(offset)) {
|
| @@ -86,12 +86,12 @@ PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c
|
| keyframes.append(keyframe);
|
|
|
| String compositeString;
|
| - DictionaryHelper::get(keyframeDictionaryVector[i], "composite", compositeString);
|
| + keyframeDictionaryVector[i].get("composite", compositeString);
|
| if (compositeString == "add")
|
| keyframe->setComposite(AnimationEffect::CompositeAdd);
|
|
|
| String timingFunctionString;
|
| - if (DictionaryHelper::get(keyframeDictionaryVector[i], "easing", timingFunctionString)) {
|
| + if (keyframeDictionaryVector[i].get("easing", timingFunctionString)) {
|
| if (RefPtrWillBeRawPtr<CSSValue> timingFunctionValue = BisonCSSParser::parseAnimationTimingFunctionValue(timingFunctionString))
|
| keyframe->setEasing(CSSToStyleMap::mapAnimationTimingFunction(timingFunctionValue.get(), true));
|
| }
|
| @@ -104,7 +104,7 @@ PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c
|
| if (id == CSSPropertyInvalid)
|
| continue;
|
| String value;
|
| - DictionaryHelper::get(keyframeDictionaryVector[i], property, value);
|
| + keyframeDictionaryVector[i].get(property, value);
|
| keyframe->setPropertyValue(id, value, styleSheetContents);
|
| }
|
| }
|
|
|