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

Unified Diff: third_party/WebKit/Source/core/svg/SVGDocumentExtensions.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/SVGDocumentExtensions.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp b/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp
index 41465506046439dd273764efb74989dd6185bc50..3c733e2528aae50fb2a7e269664feca251cbaa9d 100644
--- a/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp
@@ -96,7 +96,7 @@ void SVGDocumentExtensions::serviceOnAnimationFrame(Document& document, double m
void SVGDocumentExtensions::serviceAnimations(double monotonicAnimationStartTime)
{
if (RuntimeEnabledFeatures::smilEnabled()) {
- WillBeHeapVector<RefPtrWillBeMember<SVGSVGElement>> timeContainers;
+ HeapVector<Member<SVGSVGElement>> timeContainers;
copyToVector(m_timeContainers, timeContainers);
for (const auto& container : timeContainers)
container->timeContainer()->serviceAnimations(monotonicAnimationStartTime);
@@ -118,7 +118,7 @@ void SVGDocumentExtensions::startAnimations()
// starting animations for a document will do this "latching"
// FIXME: We hold a ref pointers to prevent a shadow tree from getting removed out from underneath us.
// In the future we should refactor the use-element to avoid this. See https://webkit.org/b/53704
- WillBeHeapVector<RefPtrWillBeMember<SVGSVGElement>> timeContainers;
+ HeapVector<Member<SVGSVGElement>> timeContainers;
copyToVector(m_timeContainers, timeContainers);
for (const auto& container : timeContainers) {
SMILTimeContainer* timeContainer = container->timeContainer();
@@ -135,7 +135,7 @@ void SVGDocumentExtensions::pauseAnimations()
void SVGDocumentExtensions::dispatchSVGLoadEventToOutermostSVGElements()
{
- WillBeHeapVector<RefPtrWillBeMember<SVGSVGElement>> timeContainers;
+ HeapVector<Member<SVGSVGElement>> timeContainers;
copyToVector(m_timeContainers, timeContainers);
for (const auto& container : timeContainers) {
SVGSVGElement* outerSVG = container.get();
@@ -161,7 +161,7 @@ void SVGDocumentExtensions::addPendingResource(const AtomicString& id, Element*
if (id.isEmpty())
return;
- WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<SVGPendingElements>>::AddResult result = m_pendingResources.add(id, nullptr);
+ HeapHashMap<AtomicString, Member<SVGPendingElements>>::AddResult result = m_pendingResources.add(id, nullptr);
if (result.isNewEntry)
result.storedValue->value = adoptPtrWillBeNoop(new SVGPendingElements);
result.storedValue->value->add(element);
@@ -253,13 +253,13 @@ void SVGDocumentExtensions::removeElementFromPendingResources(Element* element)
}
}
-PassOwnPtrWillBeRawPtr<SVGDocumentExtensions::SVGPendingElements> SVGDocumentExtensions::removePendingResource(const AtomicString& id)
+RawPtr<SVGDocumentExtensions::SVGPendingElements> SVGDocumentExtensions::removePendingResource(const AtomicString& id)
{
ASSERT(m_pendingResources.contains(id));
return m_pendingResources.take(id);
}
-PassOwnPtrWillBeRawPtr<SVGDocumentExtensions::SVGPendingElements> SVGDocumentExtensions::removePendingResourceForRemoval(const AtomicString& id)
+RawPtr<SVGDocumentExtensions::SVGPendingElements> SVGDocumentExtensions::removePendingResourceForRemoval(const AtomicString& id)
{
ASSERT(m_pendingResourcesForRemoval.contains(id));
return m_pendingResourcesForRemoval.take(id);
@@ -272,7 +272,7 @@ void SVGDocumentExtensions::markPendingResourcesForRemoval(const AtomicString& i
ASSERT(!m_pendingResourcesForRemoval.contains(id));
- OwnPtrWillBeMember<SVGPendingElements> existing = m_pendingResources.take(id);
+ Member<SVGPendingElements> existing = m_pendingResources.take(id);
if (existing && !existing->isEmpty())
m_pendingResourcesForRemoval.add(id, existing.release());
}
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h ('k') | third_party/WebKit/Source/core/svg/SVGElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698