Index: Source/core/animation/DocumentTimeline.cpp |
diff --git a/Source/core/animation/DocumentTimeline.cpp b/Source/core/animation/DocumentTimeline.cpp |
index fd815cf3f19e6955e1f2d5234e0761e6cca677b2..b28cfb630cc47585d7f9a8b83221642dc23db0c2 100644 |
--- a/Source/core/animation/DocumentTimeline.cpp |
+++ b/Source/core/animation/DocumentTimeline.cpp |
@@ -45,17 +45,17 @@ namespace WebCore { |
const double DocumentTimeline::s_minimumDelay = 0.04; |
-PassRefPtr<DocumentTimeline> DocumentTimeline::create(Document* document, PassOwnPtr<PlatformTiming> timing) |
+PassRefPtrWillBeRawPtr<DocumentTimeline> DocumentTimeline::create(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing) |
{ |
- return adoptRef(new DocumentTimeline(document, timing)); |
+ return adoptRefWillBeNoop(new DocumentTimeline(document, timing)); |
} |
-DocumentTimeline::DocumentTimeline(Document* document, PassOwnPtr<PlatformTiming> timing) |
+DocumentTimeline::DocumentTimeline(Document* document, PassOwnPtrWillBeRawPtr<PlatformTiming> timing) |
: m_zeroTime(nullValue()) |
, m_document(document) |
{ |
if (!timing) |
- m_timing = adoptPtr(new DocumentTimelineTiming(this)); |
+ m_timing = adoptPtrWillBeNoop(new DocumentTimelineTiming(this)); |
else |
m_timing = timing; |
@@ -64,13 +64,15 @@ DocumentTimeline::DocumentTimeline(Document* document, PassOwnPtr<PlatformTiming |
DocumentTimeline::~DocumentTimeline() |
{ |
+#if !ENABLE(OILPAN) |
for (HashSet<AnimationPlayer*>::iterator it = m_players.begin(); it != m_players.end(); ++it) |
(*it)->timelineDestroyed(); |
+#endif |
} |
AnimationPlayer* DocumentTimeline::createAnimationPlayer(TimedItem* child) |
{ |
- RefPtr<AnimationPlayer> player = AnimationPlayer::create(*this, child); |
+ RefPtrWillBeRawPtr<AnimationPlayer> player = AnimationPlayer::create(*this, child); |
AnimationPlayer* result = player.get(); |
m_players.add(result); |
setOutdatedAnimationPlayer(result); |
@@ -100,8 +102,8 @@ void DocumentTimeline::serviceAnimations(AnimationPlayer::UpdateReason reason) |
m_hasOutdatedAnimationPlayer = false; |
double timeToNextEffect = std::numeric_limits<double>::infinity(); |
- Vector<AnimationPlayer*> players; |
- for (HashSet<RefPtr<AnimationPlayer> >::iterator it = m_playersNeedingUpdate.begin(); it != m_playersNeedingUpdate.end(); ++it) |
+ WillBeHeapVector<RawPtrWillBeMember<AnimationPlayer> > players; |
+ for (WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> >::iterator it = m_playersNeedingUpdate.begin(); it != m_playersNeedingUpdate.end(); ++it) |
players.append(it->get()); |
std::sort(players.begin(), players.end(), AnimationPlayer::hasLowerPriority); |
@@ -146,6 +148,11 @@ void DocumentTimeline::DocumentTimelineTiming::serviceOnNextFrame() |
m_timeline->m_document->view()->scheduleAnimation(); |
} |
+void DocumentTimeline::DocumentTimelineTiming::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_timeline); |
+} |
+ |
double DocumentTimeline::currentTime(bool& isNull) |
{ |
return currentTimeInternal(isNull) * 1000; |
@@ -181,7 +188,7 @@ double DocumentTimeline::effectiveTime() |
void DocumentTimeline::pauseAnimationsForTesting(double pauseTime) |
{ |
- for (HashSet<RefPtr<AnimationPlayer> >::iterator it = m_playersNeedingUpdate.begin(); it != m_playersNeedingUpdate.end(); ++it) |
+ for (WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> >::iterator it = m_playersNeedingUpdate.begin(); it != m_playersNeedingUpdate.end(); ++it) |
(*it)->pauseForTesting(pauseTime); |
serviceAnimations(AnimationPlayer::UpdateOnDemand); |
} |
@@ -201,7 +208,7 @@ size_t DocumentTimeline::numberOfActiveAnimationsForTesting() const |
if (isNull(m_zeroTime)) |
return 0; |
size_t count = 0; |
- for (HashSet<RefPtr<AnimationPlayer> >::iterator it = m_playersNeedingUpdate.begin(); it != m_playersNeedingUpdate.end(); ++it) { |
+ for (WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> >::iterator it = m_playersNeedingUpdate.begin(); it != m_playersNeedingUpdate.end(); ++it) { |
const TimedItem* timedItem = (*it)->source(); |
if ((*it)->hasStartTime()) |
count += (timedItem && (timedItem->isCurrent() || timedItem->isInEffect())); |
@@ -209,9 +216,17 @@ size_t DocumentTimeline::numberOfActiveAnimationsForTesting() const |
return count; |
} |
-void DocumentTimeline::detachFromDocument() { |
+void DocumentTimeline::detachFromDocument() |
+{ |
// FIXME: DocumentTimeline should keep Document alive. |
m_document = 0; |
} |
+void DocumentTimeline::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_timing); |
+ visitor->trace(m_playersNeedingUpdate); |
+ visitor->trace(m_players); |
+} |
+ |
} // namespace |