Oilpan: Remove WillBe types (part 13)

third_party/WebKit/Source/core/loader/ImageLoader.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 26 matching lines @@
 class IncrementLoadEventDelayCount;
 class FetchRequest;
 class Document;
 class Element;
 class ImageLoader;
 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;
 
     DECLARE_TRACE();
 
     enum UpdateFromElementBehavior {
         // This should be the update behavior when the element is attached to a document, or when DOM mutations trigger a new load.
         // Starts loading if a load hasn't already been started.
         UpdateNormal,
@@ skipping 77 matching lines @@
     // or to schedule a microtask.
     bool shouldLoadImmediately(const KURL&) const;
 
     // For Oilpan, we must run dispose() as a prefinalizer and call
     // m_image->removeClient(this) (and more.) Otherwise, the ImageResource can invoke
     // didAddClient() for the ImageLoader that is about to die in the current
     // lazy sweeping, and the didAddClient() can access on-heap objects that
     // 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;
     WeakPtr<Task> m_pendingTask; // owned by Microtask
     OwnPtr<IncrementLoadEventDelayCount> m_loadDelayCounter;
     bool m_hasPendingLoadEvent : 1;
     bool m_hasPendingErrorEvent : 1;
     bool m_imageComplete : 1;
     bool m_loadingImageDocument : 1;
     bool m_elementIsProtected : 1;
     bool m_suppressErrorEvents : 1;
 };
 
 } // namespace blink
 
 #endif