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

Unified Diff: third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h

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.h
diff --git a/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h b/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h
index 912769bba38b45444e627db5cebcb4a4181b7cf2..ae53906ff1ab770c84e53bab2ddf1950d8784f9b 100644
--- a/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h
+++ b/third_party/WebKit/Source/core/svg/SVGDocumentExtensions.h
@@ -38,10 +38,10 @@ class SVGSVGElement;
class SVGElement;
class Element;
-class SVGDocumentExtensions : public NoBaseWillBeGarbageCollectedFinalized<SVGDocumentExtensions> {
- WTF_MAKE_NONCOPYABLE(SVGDocumentExtensions); USING_FAST_MALLOC_WILL_BE_REMOVED(SVGDocumentExtensions);
+class SVGDocumentExtensions : public GarbageCollectedFinalized<SVGDocumentExtensions> {
+ WTF_MAKE_NONCOPYABLE(SVGDocumentExtensions);
public:
- typedef WillBeHeapHashSet<RawPtrWillBeMember<Element>> SVGPendingElements;
+ typedef HeapHashSet<Member<Element>> SVGPendingElements;
explicit SVGDocumentExtensions(Document*);
~SVGDocumentExtensions();
@@ -81,15 +81,15 @@ public:
DECLARE_TRACE();
private:
- RawPtrWillBeMember<Document> m_document;
- WillBeHeapHashSet<RawPtrWillBeMember<SVGSVGElement>> m_timeContainers; // For SVG 1.2 support this will need to be made more general.
- using SVGElementSet = WillBeHeapHashSet<RefPtrWillBeMember<SVGElement>>;
+ Member<Document> m_document;
+ HeapHashSet<Member<SVGSVGElement>> m_timeContainers; // For SVG 1.2 support this will need to be made more general.
+ using SVGElementSet = HeapHashSet<Member<SVGElement>>;
SVGElementSet m_webAnimationsPendingSVGElements;
HashMap<AtomicString, LayoutSVGResourceContainer*> m_resources;
- WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<SVGPendingElements>> m_pendingResources; // Resources that are pending.
- WillBeHeapHashMap<AtomicString, OwnPtrWillBeMember<SVGPendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
+ HeapHashMap<AtomicString, Member<SVGPendingElements>> m_pendingResources; // Resources that are pending.
+ HeapHashMap<AtomicString, Member<SVGPendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
SVGResourcesCache m_resourcesCache;
- WillBeHeapHashSet<RawPtrWillBeMember<SVGSVGElement>> m_relativeLengthSVGRoots; // Root SVG elements with relative length descendants.
+ HeapHashSet<Member<SVGSVGElement>> m_relativeLengthSVGRoots; // Root SVG elements with relative length descendants.
FloatPoint m_translate;
#if ENABLE(ASSERT)
bool m_inRelativeLengthSVGRootsInvalidation;
@@ -105,7 +105,7 @@ public:
bool isElementPendingResource(Element*, const AtomicString& id) const;
void clearHasPendingResourcesIfPossible(Element*);
void removeElementFromPendingResources(Element*);
- PassOwnPtrWillBeRawPtr<SVGPendingElements> removePendingResource(const AtomicString& id);
+ RawPtr<SVGPendingElements> removePendingResource(const AtomicString& id);
void serviceAnimations(double monotonicAnimationStartTime);
@@ -114,7 +114,7 @@ public:
Element* removeElementFromPendingResourcesForRemoval(const AtomicString&);
private:
- PassOwnPtrWillBeRawPtr<SVGPendingElements> removePendingResourceForRemoval(const AtomicString&);
+ RawPtr<SVGPendingElements> removePendingResourceForRemoval(const AtomicString&);
};
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGCursorElement.h ('k') | third_party/WebKit/Source/core/svg/SVGDocumentExtensions.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698