| Index: third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.h
|
| diff --git a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.h b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.h
|
| index be0bacdfb5f183f3a185e9b281505a577cd1deb2..645682089c2e8d09f866f3dd60cd65ad1bbab084 100644
|
| --- a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.h
|
| +++ b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.h
|
| @@ -45,9 +45,9 @@ class SVGElement;
|
| class SVGSMILElement;
|
| class SVGSVGElement;
|
|
|
| -class SMILTimeContainer : public RefCountedWillBeGarbageCollectedFinalized<SMILTimeContainer> {
|
| +class SMILTimeContainer : public GarbageCollectedFinalized<SMILTimeContainer> {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<SMILTimeContainer> create(SVGSVGElement& owner) { return adoptRefWillBeNoop(new SMILTimeContainer(owner)); }
|
| + static RawPtr<SMILTimeContainer> create(SVGSVGElement& owner) { return new SMILTimeContainer(owner); }
|
| ~SMILTimeContainer();
|
|
|
| void schedule(SVGSMILElement*, SVGElement*, const QualifiedName&);
|
| @@ -131,12 +131,12 @@ private:
|
| Timer<SMILTimeContainer> m_wakeupTimer;
|
| Timer<SMILTimeContainer> m_animationPolicyOnceTimer;
|
|
|
| - using ElementAttributePair = std::pair<RawPtrWillBeWeakMember<SVGElement>, QualifiedName>;
|
| - using AnimationsLinkedHashSet = WillBeHeapLinkedHashSet<RawPtrWillBeWeakMember<SVGSMILElement>>;
|
| - using GroupedAnimationsMap = WillBeHeapHashMap<ElementAttributePair, OwnPtrWillBeMember<AnimationsLinkedHashSet>>;
|
| + using ElementAttributePair = std::pair<WeakMember<SVGElement>, QualifiedName>;
|
| + using AnimationsLinkedHashSet = HeapLinkedHashSet<WeakMember<SVGSMILElement>>;
|
| + using GroupedAnimationsMap = HeapHashMap<ElementAttributePair, Member<AnimationsLinkedHashSet>>;
|
| GroupedAnimationsMap m_scheduledAnimations;
|
|
|
| - RawPtrWillBeMember<SVGSVGElement> m_ownerSVGElement;
|
| + Member<SVGSVGElement> m_ownerSVGElement;
|
|
|
| #if ENABLE(ASSERT)
|
| bool m_preventScheduledAnimationsChanges;
|
|
|