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

Unified Diff: Source/core/animation/ElementAnimation.h

Issue 1326443003: Web Animations: Enable additive animations in experimental (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update missed tests Created 5 years, 3 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
« no previous file with comments | « Source/core/animation/EffectInput.cpp ('k') | Source/core/animation/ElementAnimation.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/ElementAnimation.h
diff --git a/Source/core/animation/ElementAnimation.h b/Source/core/animation/ElementAnimation.h
index 56b514b50e876625ef740cc45919292111fc6100..abe45a66ed258930c38fd1ebfbfb1ea7255de97f 100644
--- a/Source/core/animation/ElementAnimation.h
+++ b/Source/core/animation/ElementAnimation.h
@@ -50,7 +50,7 @@ class Dictionary;
class ElementAnimation {
STATIC_ONLY(ElementAnimation);
public:
- static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, double duration, ExceptionState& exceptionState)
+ static Animation* animate(Element& element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, double duration, ExceptionState& exceptionState)
{
EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
if (exceptionState.hadException())
@@ -58,7 +58,7 @@ public:
return animateInternal(element, effect, TimingInput::convert(duration));
}
- static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, const KeyframeEffectOptions& timingInput, ExceptionState& exceptionState)
+ static Animation* animate(Element& element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, const KeyframeEffectOptions& timingInput, ExceptionState& exceptionState)
{
EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
if (exceptionState.hadException())
@@ -66,7 +66,7 @@ public:
return animateInternal(element, effect, TimingInput::convert(timingInput));
}
- static Animation* animate(Element& element, const EffectModelOrDictionarySequence& effectInput, ExceptionState& exceptionState)
+ static Animation* animate(Element& element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, ExceptionState& exceptionState)
{
EffectModel* effect = EffectInput::convert(&element, effectInput, exceptionState);
if (exceptionState.hadException())
« no previous file with comments | « Source/core/animation/EffectInput.cpp ('k') | Source/core/animation/ElementAnimation.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698