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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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: third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
diff --git a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
index 1434a44f442fc05544a0bfdf7360da44e401959e..083aaec106c2fec2752ba9c048c3143a903211fa 100644
--- a/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
+++ b/third_party/WebKit/Source/core/svg/animation/SMILTimeContainer.cpp
@@ -91,7 +91,7 @@ void SMILTimeContainer::schedule(SVGSMILElement* animation, SVGElement* target,
#endif
ElementAttributePair key(target, attributeName);
- OwnPtrWillBeMember<AnimationsLinkedHashSet>& scheduled = m_scheduledAnimations.add(key, nullptr).storedValue->value;
+ Member<AnimationsLinkedHashSet>& scheduled = m_scheduledAnimations.add(key, nullptr).storedValue->value;
if (!scheduled)
scheduled = adoptPtrWillBeNoop(new AnimationsLinkedHashSet);
ASSERT(!scheduled->contains(animation));
@@ -386,7 +386,7 @@ void SMILTimeContainer::updateDocumentOrderIndexes()
struct PriorityCompare {
PriorityCompare(SMILTime elapsed) : m_elapsed(elapsed) {}
- bool operator()(const RefPtrWillBeMember<SVGSMILElement>& a, const RefPtrWillBeMember<SVGSMILElement>& b)
+ bool operator()(const Member<SVGSMILElement>& a, const Member<SVGSMILElement>& b)
{
// FIXME: This should also consider possible timing relations between the elements.
SMILTime aBegin = a->intervalBegin();
@@ -470,8 +470,8 @@ SMILTime SMILTimeContainer::updateAnimations(SMILTime elapsed, bool seekToTime)
if (m_documentOrderIndexesDirty)
updateDocumentOrderIndexes();
- WillBeHeapHashSet<ElementAttributePair> invalidKeys;
- using AnimationsVector = WillBeHeapVector<RefPtrWillBeMember<SVGSMILElement>>;
+ HeapHashSet<ElementAttributePair> invalidKeys;
+ using AnimationsVector = HeapVector<Member<SVGSMILElement>>;
AnimationsVector animationsToApply;
AnimationsVector scheduledAnimationsInSameGroup;
for (const auto& entry : m_scheduledAnimations) {
@@ -533,8 +533,8 @@ SMILTime SMILTimeContainer::updateAnimations(SMILTime elapsed, bool seekToTime)
for (unsigned i = 0; i < animationsToApplySize; ++i) {
if (animationsToApply[i]->inDocument() && animationsToApply[i]->isSVGDiscardElement()) {
- RefPtrWillBeRawPtr<SVGSMILElement> animDiscard = animationsToApply[i];
- RefPtrWillBeRawPtr<SVGElement> targetElement = animDiscard->targetElement();
+ RawPtr<SVGSMILElement> animDiscard = animationsToApply[i];
+ RawPtr<SVGElement> targetElement = animDiscard->targetElement();
if (targetElement && targetElement->inDocument()) {
targetElement->remove(IGNORE_EXCEPTION);
ASSERT(!targetElement->inDocument());

Powered by Google App Engine
This is Rietveld 408576698