Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Unified Diff: third_party/WebKit/Source/core/animation/KeyframeEffect.cpp

Issue 1906463002: Web Animations: Throw TypeErrors for invalid timing parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
diff --git a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
index 4d989e7faf301db8e77f969d0b095083a4fcd5c1..9696eac0d44430a4da3b25330f875e777077fa14 100644
--- a/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
+++ b/third_party/WebKit/Source/core/animation/KeyframeEffect.cpp
@@ -58,7 +58,10 @@ KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
if (element)
UseCounter::count(element->document(), UseCounter::AnimationConstructorKeyframeListEffectObjectTiming);
- return create(element, EffectInput::convert(element, effectInput, executionContext, exceptionState), TimingInput::convert(duration));
+ Timing timing;
+ if (!TimingInput::convert(duration, timing, exceptionState))
+ return nullptr;
+ return create(element, EffectInput::convert(element, effectInput, executionContext, exceptionState), timing);
}
KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Element* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, const KeyframeEffectOptions& timingInput, ExceptionState& exceptionState)
@@ -67,10 +70,8 @@ KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
if (element)
UseCounter::count(element->document(), UseCounter::AnimationConstructorKeyframeListEffectObjectTiming);
Timing timing;
- bool success = TimingInput::convert(timingInput, timing, &element->document(), exceptionState);
- if (!success || exceptionState.hadException())
+ if (!TimingInput::convert(timingInput, timing, &element->document(), exceptionState))
return nullptr;
-
return create(element, EffectInput::convert(element, effectInput, executionContext, exceptionState), timing);
}

Powered by Google App Engine
This is Rietveld 408576698