| 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 abb6414f84a8288205bf85839ff01ec0ab02031b..1e48abf9a188d990207a175ae489a249b9e87063 100644
|
| --- a/third_party/WebKit/Source/core/loader/ImageLoader.h
|
| +++ b/third_party/WebKit/Source/core/loader/ImageLoader.h
|
| @@ -44,9 +44,8 @@ class LayoutImageResource;
|
| template<typename T> class EventSender;
|
| using ImageEventSender = EventSender<ImageLoader>;
|
|
|
| -class CORE_EXPORT ImageLoader : public NoBaseWillBeGarbageCollectedFinalized<ImageLoader>, public ResourceClient, public ImageResourceObserver {
|
| - WILL_BE_USING_PRE_FINALIZER(ImageLoader, dispose);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(ImageLoader);
|
| +class CORE_EXPORT ImageLoader : public GarbageCollectedFinalized<ImageLoader>, public ResourceClient, public ImageResourceObserver {
|
| + USING_PRE_FINALIZER(ImageLoader, dispose);
|
| public:
|
| explicit ImageLoader(Element*);
|
| ~ImageLoader() override;
|
| @@ -144,12 +143,12 @@ private:
|
| // have already been finalized in the current lazy sweeping.
|
| void dispose();
|
|
|
| - 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;
|
|
|
| Timer<ImageLoader> m_derefElementTimer;
|
| AtomicString m_failedLoadURL;
|
|
|