Oilpan: Remove WillBe types (part 9)

third_party/WebKit/Source/core/fetch/ImageResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@kde.org>
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 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 27 matching lines @@
 class FetchRequest;
 class FloatSize;
 class ImageResourceObserver;
 class MemoryCache;
 class ResourceClient;
 class ResourceFetcher;
 class SecurityOrigin;
 
 class CORE_EXPORT ImageResource final : public Resource, public ImageObserver, public MultipartImageResourceParser::Client {
     friend class MemoryCache;
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ImageResource);
+    USING_GARBAGE_COLLECTED_MIXIN(ImageResource);
 public:
     using ClientType = ResourceClient;
 
-    static PassRefPtrWillBeRawPtr<ImageResource> fetch(FetchRequest&, ResourceFetcher*);
+    static RawPtr<ImageResource> fetch(FetchRequest&, ResourceFetcher*);
 
-    static PassRefPtrWillBeRawPtr<ImageResource> create(blink::Image* image)
+    static RawPtr<ImageResource> create(blink::Image* image)
     {
-        return adoptRefWillBeNoop(new ImageResource(image, ResourceLoaderOptions()));
+        return new ImageResource(image, ResourceLoaderOptions());
     }
 
     // Exposed for testing
-    static PassRefPtrWillBeRawPtr<ImageResource> create(const ResourceRequest& request, blink::Image* image)
+    static RawPtr<ImageResource> create(const ResourceRequest& request, blink::Image* image)
     {
-        return adoptRefWillBeNoop(new ImageResource(request, image, ResourceLoaderOptions()));
+        return new ImageResource(request, image, ResourceLoaderOptions());
     }
 
     ~ImageResource() override;
 
     blink::Image* getImage(); // Returns the nullImage() if the image is not available yet.
     bool hasImage() const { return m_image.get(); }
 
     static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
     bool willPaintBrokenImage() const;
 
@@ skipping 63 matching lines @@
         WaitingForFirstPart,
         ParsingFirstPart,
         FinishedParsingFirstPart,
     };
 
     class ImageResourceFactory : public ResourceFactory {
     public:
         ImageResourceFactory()
             : ResourceFactory(Resource::Image) { }
 
-        PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String&) const override
+        RawPtr<Resource> create(const ResourceRequest& request, const ResourceLoaderOptions& options, const String&) const override
         {
-            return adoptRefWillBeNoop(new ImageResource(request, options));
+            return new ImageResource(request, options);
         }
     };
     ImageResource(const ResourceRequest&, const ResourceLoaderOptions&);
 
     void clear();
 
     void setCustomAcceptHeader();
     void createImage();
     void updateImage(bool allDataReceived);
     void clearImage();
     // If not null, changeRect is the changed part of the image.
     void notifyObservers(bool isNotifyingFinish, const IntRect* changeRect = nullptr);
     void notifyObserver(ImageResourceObserver*, bool isNotifyingFinish, const IntRect* changeRect = nullptr);
 
     float m_devicePixelRatioHeaderValue;
 
-    PersistentWillBeMember<MultipartImageResourceParser> m_multipartParser;
+    Member<MultipartImageResourceParser> m_multipartParser;
     RefPtr<blink::Image> m_image;
     MultipartParsingState m_multipartParsingState = MultipartParsingState::WaitingForFirstPart;
     bool m_hasDevicePixelRatioHeaderValue;
     HashCountedSet<ImageResourceObserver*> m_observers;
     HashCountedSet<ImageResourceObserver*> m_finishedObservers;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 } // namespace blink
 
 #endif