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

Unified Diff: Source/core/svg/animation/SMILTimeContainer.cpp

Issue 304453002: Prepare SMILTimeContainer for oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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
Index: Source/core/svg/animation/SMILTimeContainer.cpp
diff --git a/Source/core/svg/animation/SMILTimeContainer.cpp b/Source/core/svg/animation/SMILTimeContainer.cpp
index 257ecdfab007d655819140e6efad05f2f63ad71b..ec53ca30e3a5f9d8f619d91d0f22910f322d68b0 100644
--- a/Source/core/svg/animation/SMILTimeContainer.cpp
+++ b/Source/core/svg/animation/SMILTimeContainer.cpp
@@ -87,9 +87,9 @@ void SMILTimeContainer::schedule(SVGSMILElement* animation, SVGElement* target,
#endif
ElementAttributePair key(target, attributeName);
- OwnPtr<AnimationsVector>& scheduled = m_scheduledAnimations.add(key, nullptr).storedValue->value;
+ OwnPtrWillBeMember<AnimationsVector>& scheduled = m_scheduledAnimations.add(key, nullptr).storedValue->value;
if (!scheduled)
- scheduled = adoptPtr(new AnimationsVector);
+ scheduled = adoptPtrWillBeNoop(new AnimationsVector);
ASSERT(!scheduled->contains(animation));
scheduled->append(animation);
@@ -301,7 +301,7 @@ void SMILTimeContainer::updateDocumentOrderIndexes()
struct PriorityCompare {
PriorityCompare(SMILTime elapsed) : m_elapsed(elapsed) {}
- bool operator()(const RefPtr<SVGSMILElement>& a, const RefPtr<SVGSMILElement>& b)
+ bool operator()(const RefPtrWillBeMember<SVGSMILElement>& a, const RefPtrWillBeMember<SVGSMILElement>& b)
{
// FIXME: This should also consider possible timing relations between the elements.
SMILTime aBegin = a->intervalBegin();
@@ -452,4 +452,9 @@ SMILTime SMILTimeContainer::updateAnimations(SMILTime elapsed, bool seekToTime)
return earliestFireTime;
}
+void SMILTimeContainer::trace(Visitor* visitor)
+{
+ visitor->trace(m_scheduledAnimations);
+}
+
}

Powered by Google App Engine
This is Rietveld 408576698