Index: Source/core/animation/SampledEffect.cpp |
diff --git a/Source/core/animation/SampledEffect.cpp b/Source/core/animation/SampledEffect.cpp |
index 328d237226d79cefe5a9d08079635c9a7085e0af..8f35b021b2a84990ff53621d71a34c259a3d0566 100644 |
--- a/Source/core/animation/SampledEffect.cpp |
+++ b/Source/core/animation/SampledEffect.cpp |
@@ -19,16 +19,20 @@ SampledEffect::SampledEffect(Animation* animation, PassOwnPtrWillBeRawPtr<WillBe |
bool SampledEffect::canChange() const |
{ |
+#if ENABLE(OILPAN) |
+ return m_animation; |
+#else |
if (!m_animation) |
return false; |
// FIXME: This check won't be needed when Animation and AnimationPlayer are moved to Oilpan. |
return !m_player->canFree(); |
+#endif |
} |
void SampledEffect::clear() |
{ |
- m_player.clear(); |
- m_animation = 0; |
+ m_player = nullptr; |
+ m_animation = nullptr; |
m_interpolations->clear(); |
} |
@@ -45,4 +49,11 @@ void SampledEffect::removeReplacedInterpolationsIfNeeded(const BitArray<numCSSPr |
m_interpolations->shrink(dest); |
} |
+void SampledEffect::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_player); |
+ visitor->trace(m_animation); |
+ visitor->trace(m_interpolations); |
+} |
+ |
} // namespace WebCore |