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

Unified Diff: sky/engine/core/animation/Animation.cpp

Issue 718873003: Remove most of config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/Animation.h ('k') | sky/engine/core/animation/AnimationPlayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/animation/Animation.cpp
diff --git a/sky/engine/core/animation/Animation.cpp b/sky/engine/core/animation/Animation.cpp
index 542f15978e724de48f3ec804586904915e7cf829..fa57474a6493a3cbe8f0d892d2d8bd85a97aa86f 100644
--- a/sky/engine/core/animation/Animation.cpp
+++ b/sky/engine/core/animation/Animation.cpp
@@ -95,18 +95,14 @@ Animation::Animation(Element* target, PassRefPtr<AnimationEffect> effect, const
, m_sampledEffect(nullptr)
, m_priority(priority)
{
-#if !ENABLE(OILPAN)
if (m_target)
m_target->ensureActiveAnimations().addAnimation(this);
-#endif
}
Animation::~Animation()
{
-#if !ENABLE(OILPAN)
if (m_target)
m_target->activeAnimations()->notifyAnimationDestroyed(this);
-#endif
}
void Animation::attach(AnimationPlayer* player)
@@ -230,7 +226,6 @@ void Animation::notifySampledEffectRemovedFromAnimationStack()
m_sampledEffect = nullptr;
}
-#if !ENABLE(OILPAN)
void Animation::notifyElementDestroyed()
{
// If our player is kept alive just by the sampledEffect, we might get our
@@ -243,7 +238,6 @@ void Animation::notifyElementDestroyed()
if (sampledEffect)
sampledEffect->clear();
}
-#endif
bool Animation::isCandidateForAnimationOnCompositor() const
{
« no previous file with comments | « sky/engine/core/animation/Animation.h ('k') | sky/engine/core/animation/AnimationPlayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698