| Index: third_party/WebKit/Source/core/animation/EffectInput.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/EffectInput.cpp b/third_party/WebKit/Source/core/animation/EffectInput.cpp
|
| index 2da614f5f0e7a4f763d7b93dc052ebdfc05962a9..de94a0e09c52e69baf446e2e00bf9ee089a1c62b 100644
|
| --- a/third_party/WebKit/Source/core/animation/EffectInput.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/EffectInput.cpp
|
| @@ -225,8 +225,10 @@ EffectModel* EffectInput::convertArrayForm(
|
| keyframe->setEasing(timingFunction);
|
| }
|
|
|
| - Vector<String> keyframeProperties;
|
| - keyframeDictionary.getPropertyNames(keyframeProperties);
|
| + const Vector<String>& keyframeProperties =
|
| + keyframeDictionary.getPropertyNames(exceptionState);
|
| + if (exceptionState.hadException())
|
| + return nullptr;
|
| for (const auto& property : keyframeProperties) {
|
| if (property == "offset" || property == "composite" ||
|
| property == "easing") {
|
| @@ -323,8 +325,10 @@ EffectModel* EffectInput::convertObjectForm(
|
| String compositeString;
|
| DictionaryHelper::get(keyframeDictionary, "composite", compositeString);
|
|
|
| - Vector<String> keyframeProperties;
|
| - keyframeDictionary.getPropertyNames(keyframeProperties);
|
| + const Vector<String>& keyframeProperties =
|
| + keyframeDictionary.getPropertyNames(exceptionState);
|
| + if (exceptionState.hadException())
|
| + return nullptr;
|
| for (const auto& property : keyframeProperties) {
|
| if (property == "offset" || property == "composite" ||
|
| property == "easing") {
|
|
|