Oilpan: Remove WillBe types (part 13)

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef LinkPreloadResourceClients_h
 #define LinkPreloadResourceClients_h
 
 #include "core/fetch/CSSStyleSheetResource.h"
 #include "core/fetch/FontResource.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/ResourceLoader.h"
 #include "core/fetch/ResourceOwner.h"
 #include "core/fetch/ScriptResource.h"
 #include "core/fetch/StyleSheetResourceClient.h"
 
 namespace blink {
 
 class LinkLoader;
 
-class LinkPreloadResourceClient : public NoBaseWillBeGarbageCollectedFinalized<LinkPreloadResourceClient> {
+class LinkPreloadResourceClient : public GarbageCollectedFinalized<LinkPreloadResourceClient> {
 public:
     virtual ~LinkPreloadResourceClient() { }
 
     void triggerEvents(const Resource*);
     virtual void clear() = 0;
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_loader);
     }
 
 protected:
     LinkPreloadResourceClient(LinkLoader* loader)
         : m_loader(loader)
     {
         ASSERT(loader);
     }
 
 private:
-    RawPtrWillBeMember<LinkLoader> m_loader;
+    Member<LinkLoader> m_loader;
 };
 
 class LinkPreloadScriptResourceClient: public LinkPreloadResourceClient, public ResourceOwner<ScriptResource, ScriptResourceClient> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadScriptResourceClient);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadScriptResourceClient);
+    USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadScriptResourceClient);
 public:
-    static PassOwnPtrWillBeRawPtr<LinkPreloadScriptResourceClient> create(LinkLoader* loader, PassRefPtrWillBeRawPtr<ScriptResource> resource)
+    static RawPtr<LinkPreloadScriptResourceClient> create(LinkLoader* loader, RawPtr<ScriptResource> resource)
     {
-        return adoptPtrWillBeNoop(new LinkPreloadScriptResourceClient(loader, resource));
+        return new LinkPreloadScriptResourceClient(loader, resource);
     }
 
     virtual String debugName() const { return "LinkPreloadScript"; }
     virtual ~LinkPreloadScriptResourceClient() { }
 
     void clear() override { clearResource(); }
 
     void notifyFinished(Resource* resource) override
     {
         ASSERT(this->resource() == resource);
         triggerEvents(resource);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         LinkPreloadResourceClient::trace(visitor);
         ResourceOwner<ScriptResource, ScriptResourceClient>::trace(visitor);
     }
 
 private:
-    LinkPreloadScriptResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<ScriptResource> resource)
+    LinkPreloadScriptResourceClient(LinkLoader* loader, RawPtr<ScriptResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
 class LinkPreloadStyleResourceClient: public LinkPreloadResourceClient, public ResourceOwner<CSSStyleSheetResource, StyleSheetResourceClient> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadStyleResourceClient);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadStyleResourceClient);
+    USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadStyleResourceClient);
 public:
-    static PassOwnPtrWillBeRawPtr<LinkPreloadStyleResourceClient> create(LinkLoader* loader, PassRefPtrWillBeRawPtr<CSSStyleSheetResource> resource)
+    static RawPtr<LinkPreloadStyleResourceClient> create(LinkLoader* loader, RawPtr<CSSStyleSheetResource> resource)
     {
-        return adoptPtrWillBeNoop(new LinkPreloadStyleResourceClient(loader, resource));
+        return new LinkPreloadStyleResourceClient(loader, resource);
     }
 
     virtual String debugName() const { return "LinkPreloadStyle"; }
     virtual ~LinkPreloadStyleResourceClient() { }
 
     void clear() override { clearResource(); }
 
     void setCSSStyleSheet(const String&, const KURL&, const String&, const CSSStyleSheetResource* resource) override
     {
         ASSERT(this->resource() == resource);
         triggerEvents(static_cast<const Resource*>(resource));
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         LinkPreloadResourceClient::trace(visitor);
         ResourceOwner<CSSStyleSheetResource, StyleSheetResourceClient>::trace(visitor);
     }
 
 private:
-    LinkPreloadStyleResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<CSSStyleSheetResource> resource)
+    LinkPreloadStyleResourceClient(LinkLoader* loader, RawPtr<CSSStyleSheetResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
 class LinkPreloadImageResourceClient: public LinkPreloadResourceClient, public ResourceOwner<ImageResource> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadImageResourceClient);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadImageResourceClient);
+    USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadImageResourceClient);
 public:
-    static PassOwnPtrWillBeRawPtr<LinkPreloadImageResourceClient> create(LinkLoader* loader, PassRefPtrWillBeRawPtr<ImageResource> resource)
+    static RawPtr<LinkPreloadImageResourceClient> create(LinkLoader* loader, RawPtr<ImageResource> resource)
     {
-        return adoptPtrWillBeNoop(new LinkPreloadImageResourceClient(loader, resource));
+        return new LinkPreloadImageResourceClient(loader, resource);
     }
 
     virtual String debugName() const { return "LinkPreloadImage"; }
     virtual ~LinkPreloadImageResourceClient() { }
 
     void clear() override { clearResource(); }
 
     void notifyFinished(Resource* resource) override
     {
         ASSERT(this->resource() == toImageResource(resource));
         triggerEvents(resource);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         LinkPreloadResourceClient::trace(visitor);
         ResourceOwner<ImageResource>::trace(visitor);
     }
 
 private:
-    LinkPreloadImageResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<ImageResource> resource)
+    LinkPreloadImageResourceClient(LinkLoader* loader, RawPtr<ImageResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
 class LinkPreloadFontResourceClient: public LinkPreloadResourceClient, public ResourceOwner<FontResource, FontResourceClient> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadFontResourceClient);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadFontResourceClient);
+    USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadFontResourceClient);
 public:
-    static PassOwnPtrWillBeRawPtr<LinkPreloadFontResourceClient> create(LinkLoader* loader, PassRefPtrWillBeRawPtr<FontResource> resource)
+    static RawPtr<LinkPreloadFontResourceClient> create(LinkLoader* loader, RawPtr<FontResource> resource)
     {
-        return adoptPtrWillBeNoop(new LinkPreloadFontResourceClient(loader, resource));
+        return new LinkPreloadFontResourceClient(loader, resource);
     }
 
     virtual String debugName() const { return "LinkPreloadFont"; }
     virtual ~LinkPreloadFontResourceClient() { }
 
     void clear() override { clearResource(); }
 
     void fontLoaded(FontResource* resource) override
     {
         ASSERT(this->resource() == resource);
         triggerEvents(resource);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         LinkPreloadResourceClient::trace(visitor);
         ResourceOwner<FontResource, FontResourceClient>::trace(visitor);
     }
 
 private:
-    LinkPreloadFontResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<FontResource> resource)
+    LinkPreloadFontResourceClient(LinkLoader* loader, RawPtr<FontResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
 class LinkPreloadRawResourceClient: public LinkPreloadResourceClient, public ResourceOwner<RawResource, RawResourceClient> {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadRawResourceClient);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(LinkPreloadRawResourceClient);
+    USING_GARBAGE_COLLECTED_MIXIN(LinkPreloadRawResourceClient);
 public:
-    static PassOwnPtrWillBeRawPtr<LinkPreloadRawResourceClient> create(LinkLoader* loader, PassRefPtrWillBeRawPtr<RawResource> resource)
+    static RawPtr<LinkPreloadRawResourceClient> create(LinkLoader* loader, RawPtr<RawResource> resource)
     {
-        return adoptPtrWillBeNoop(new LinkPreloadRawResourceClient(loader, resource));
+        return new LinkPreloadRawResourceClient(loader, resource);
     }
 
     virtual String debugName() const { return "LinkPreloadRaw"; }
     virtual ~LinkPreloadRawResourceClient() { }
 
     void clear() override { clearResource(); }
 
     void notifyFinished(Resource* resource) override
     {
         ASSERT(this->resource() == toRawResource(resource));
         triggerEvents(resource);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         LinkPreloadResourceClient::trace(visitor);
         ResourceOwner<RawResource, RawResourceClient>::trace(visitor);
     }
 
 private:
-    LinkPreloadRawResourceClient(LinkLoader* loader, PassRefPtrWillBeRawPtr<RawResource> resource)
+    LinkPreloadRawResourceClient(LinkLoader* loader, RawPtr<RawResource> resource)
         : LinkPreloadResourceClient(loader)
     {
         setResource(resource);
     }
 };
 
 } // namespace blink
 
 #endif // LinkPreloadResourceClients_h