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

Unified Diff: sky/engine/core/animation/ElementAnimation.h

Issue 922893002: Merge the Sky Engine changes from the SkyDart branch (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 | « sky/engine/core/animation/EffectInputTest.cpp ('k') | sky/engine/core/animation/ElementAnimation.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/ElementAnimation.h
diff --git a/sky/engine/core/animation/ElementAnimation.h b/sky/engine/core/animation/ElementAnimation.h
index 8da5bb49015e284b7b93129d1652c5d116f0137c..1e6bfc6b0ffe36e44fea70904203d651cbac003c 100644
--- a/sky/engine/core/animation/ElementAnimation.h
+++ b/sky/engine/core/animation/ElementAnimation.h
@@ -65,7 +65,7 @@ public:
static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState& exceptionState)
{
RefPtr<AnimationEffect> effect = EffectInput::convert(&element, keyframeDictionaryVector, exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return 0;
ASSERT(effect);
return animateInternal(element, effect.release(), TimingInput::convert(timingInputDictionary));
@@ -74,7 +74,7 @@ public:
static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)
{
RefPtr<AnimationEffect> effect = EffectInput::convert(&element, keyframeDictionaryVector, exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return 0;
ASSERT(effect);
return animateInternal(element, effect.release(), TimingInput::convert(duration));
@@ -83,7 +83,7 @@ public:
static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
{
RefPtr<AnimationEffect> effect = EffectInput::convert(&element, keyframeDictionaryVector, exceptionState);
- if (exceptionState.hadException())
+ if (exceptionState.had_exception())
return 0;
ASSERT(effect);
return animateInternal(element, effect.release(), Timing());
« no previous file with comments | « sky/engine/core/animation/EffectInputTest.cpp ('k') | sky/engine/core/animation/ElementAnimation.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698