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

Unified Diff: third_party/WebKit/Source/core/loader/ImageLoader.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, 10 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/loader/ImageLoader.h
diff --git a/third_party/WebKit/Source/core/loader/ImageLoader.h b/third_party/WebKit/Source/core/loader/ImageLoader.h
index fd3ca94b90eb1b7caa42b8a7ad9a101964d558ca..a98615db08bc07d65c2b50ee1808d5ca424adfc6 100644
--- a/third_party/WebKit/Source/core/loader/ImageLoader.h
+++ b/third_party/WebKit/Source/core/loader/ImageLoader.h
@@ -37,7 +37,7 @@ class IncrementLoadEventDelayCount;
class FetchRequest;
class Document;
-class CORE_EXPORT ImageLoaderClient : public WillBeGarbageCollectedMixin {
+class CORE_EXPORT ImageLoaderClient : public GarbageCollectedMixin {
public:
virtual void notifyImageSourceChanged() = 0;
@@ -57,9 +57,8 @@ class LayoutImageResource;
template<typename T> class EventSender;
using ImageEventSender = EventSender<ImageLoader>;
-class CORE_EXPORT ImageLoader : public NoBaseWillBeGarbageCollectedFinalized<ImageLoader>, public ImageResourceClient {
- WILL_BE_USING_PRE_FINALIZER(ImageLoader, dispose);
- USING_FAST_MALLOC_WILL_BE_REMOVED(ImageLoader);
+class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>, public ImageResourceClient {
+ USING_PRE_FINALIZER(ImageLoader, dispose);
public:
explicit ImageLoader(Element*);
~ImageLoader() override;
@@ -167,15 +166,15 @@ private:
void clearWeakMembers(Visitor*);
#endif
- RawPtrWillBeMember<Element> m_element;
- RefPtrWillBeMember<ImageResource> m_image;
+ Member<Element> m_element;
+ Member<ImageResource> m_image;
// FIXME: Oilpan: We might be able to remove this Persistent hack when
// ImageResourceClient is traceable.
GC_PLUGIN_IGNORE("http://crbug.com/383741")
- RefPtrWillBePersistent<Element> m_keepAlive;
+ Persistent<Element> m_keepAlive;
// Oilpan: the client references are weak, and managed as such via clearWeakMembers();
- HashSet<RawPtrWillBeUntracedMember<ImageLoaderClient>> m_clients;
+ HashSet<UntracedMember<ImageLoaderClient>> m_clients;
Timer<ImageLoader> m_derefElementTimer;
AtomicString m_failedLoadURL;
WeakPtr<Task> m_pendingTask; // owned by Microtask

Powered by Google App Engine
This is Rietveld 408576698