Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/fetch/Resource.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, 2008, 2009, 2010, 2011 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 37 matching lines @@
 class ResourceClient;
 class ResourceFetcher;
 class ResourceTimingInfo;
 class ResourceLoader;
 class SecurityOrigin;
 class SharedBuffer;
 
 // A resource that is held in the cache. Classes who want to use this object should derive
 // from ResourceClient, to get the function calls in case the requested data has arrived.
 // This class also does the actual communication with the loader to obtain the resource from the network.
-class CORE_EXPORT Resource : public RefCountedWillBeGarbageCollectedFinalized<Resource> {
+class CORE_EXPORT Resource : public GarbageCollectedFinalized<Resource> {
     WTF_MAKE_NONCOPYABLE(Resource);
-    USING_FAST_MALLOC_WITH_TYPE_NAME_WILL_BE_REMOVED(blink::Resource);
 public:
     enum Type {
         MainResource,
         Image,
         CSSStyleSheet,
         Script,
         Font,
         Raw,
         SVGDocument,
         XSLStyleSheet,
         LinkPrefetch,
         LinkPreload,
         TextTrack,
         ImportResource,
         Media, // Audio or video file requested by a HTML5 media element
         Manifest
     };
 
     enum Status {
         NotStarted,
         LoadStartScheduled, // scheduled but not yet started, only used by fonts.
         Pending, // load in progress
         Cached, // load completed successfully
         LoadError,
         DecodeError
     };
 
     // Exposed for testing.
-    static PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest& request, Type type, const ResourceLoaderOptions& options = ResourceLoaderOptions())
+    static RawPtr<Resource> create(const ResourceRequest& request, Type type, const ResourceLoaderOptions& options = ResourceLoaderOptions())
     {
-        return adoptRefWillBeNoop(new Resource(request, type, options));
+        return new Resource(request, type, options);
     }
     virtual ~Resource();
 
     virtual void removedFromMemoryCache();
     DECLARE_VIRTUAL_TRACE();
 
     virtual void load(ResourceFetcher*);
 
     virtual void setEncoding(const String&) { }
     virtual String encoding() const { return String(); }
@@ skipping 138 matching lines @@
 
     // Used by the MemoryCache to reduce the memory consumption of the entry.
     void prune();
 
     virtual void onMemoryDump(WebMemoryDumpLevelOfDetail, WebProcessMemoryDump*) const;
 
     static const char* resourceTypeToString(Type, const FetchInitiatorInfo&);
     static const char* resourceTypeName(Type);
 
     // TODO(japhet): Remove once oilpan ships, it doesn't need the WeakPtr.
-    WeakPtrWillBeRawPtr<Resource> asWeakPtr();
+    RawPtr<Resource> asWeakPtr();
 
 protected:
     Resource(const ResourceRequest&, Type, const ResourceLoaderOptions&);
 
     virtual void checkNotify();
 
     virtual void destroyDecodedDataForFailedRevalidation() { }
 
     void setEncodedSize(size_t);
     void setDecodedSize(size_t);
     void didAccessDecodedData();
 
     void finishPendingClients();
 
     virtual void didAddClient(ResourceClient*);
     void willAddClientOrObserver();
 
     // |this| object may be dead after didRemoveClientOrObserver().
     void didRemoveClientOrObserver();
     virtual void allClientsAndObserversRemoved();
 
     HashCountedSet<ResourceClient*> m_clients;
     HashCountedSet<ResourceClient*> m_clientsAwaitingCallback;
     HashCountedSet<ResourceClient*> m_finishedClients;
 
-    class ResourceCallback : public NoBaseWillBeGarbageCollectedFinalized<ResourceCallback> {
+    class ResourceCallback : public GarbageCollectedFinalized<ResourceCallback> {
     public:
         static ResourceCallback* callbackHandler();
         DECLARE_TRACE();
         void schedule(Resource*);
         void cancel(Resource*);
         bool isScheduled(Resource*) const;
     private:
         ResourceCallback();
         void runTask();
         OwnPtr<CancellableTaskFactory> m_callbackTaskFactory;
-        WillBeHeapHashSet<RefPtrWillBeMember<Resource>> m_resourcesWithPendingClients;
+        HeapHashSet<Member<Resource>> m_resourcesWithPendingClients;
     };
 
     bool hasClient(ResourceClient* client) { return m_clients.contains(client) || m_clientsAwaitingCallback.contains(client) || m_finishedClients.contains(client); }
 
     struct RedirectPair {
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     public:
         explicit RedirectPair(const ResourceRequest& request, const ResourceResponse& redirectResponse)
             : m_request(request)
             , m_redirectResponse(redirectResponse)
         {
         }
 
         ResourceRequest m_request;
         ResourceResponse m_redirectResponse;
     };
     const Vector<RedirectPair>& redirectChain() const { return m_redirectChain; }
 
     virtual bool isSafeToUnlock() const { return false; }
     virtual void destroyDecodedDataIfPossible() { }
 
     void markClientsFinished();
 
     // Returns the memory dump name used for tracing. See Resource::onMemoryDump.
     String getMemoryDumpName() const;
 
     ResourceRequest m_resourceRequest;
     ResourceRequest m_revalidatingRequest;
     AtomicString m_accept;
-    PersistentWillBeMember<ResourceLoader> m_loader;
+    Member<ResourceLoader> m_loader;
     ResourceLoaderOptions m_options;
 
     ResourceResponse m_response;
     double m_responseTimestamp;
 
     RefPtr<SharedBuffer> m_data;
     Timer<Resource> m_cancelTimer;
 
 private:
     class CacheHandler;
@@ skipping 10 matching lines @@
     void clearCachedMetadata(CachedMetadataHandler::CacheType);
     CachedMetadata* cachedMetadata(unsigned dataTypeID) const;
 
     String m_fragmentIdentifierForRequest;
 
 #if !ENABLE(OILPAN)
     WeakPtrFactory<Resource> m_weakPtrFactory;
 #endif
 
     RefPtr<CachedMetadata> m_cachedMetadata;
-    OwnPtrWillBeMember<CacheHandler> m_cacheHandler;
+    Member<CacheHandler> m_cacheHandler;
 
     ResourceError m_error;
 
     double m_loadFinishTime;
 
     unsigned long m_identifier;
 
     size_t m_encodedSize;
     size_t m_decodedSize;
 
@@ skipping 14 matching lines @@
     unsigned m_needsSynchronousCacheHit : 1;
     unsigned m_linkPreload : 1;
 
     // Ordered list of all redirects followed while fetching this resource.
     Vector<RedirectPair> m_redirectChain;
 };
 
 class ResourceFactory {
     STACK_ALLOCATED();
 public:
-    virtual PassRefPtrWillBeRawPtr<Resource> create(const ResourceRequest&, const ResourceLoaderOptions&, const String&) const = 0;
+    virtual RawPtr<Resource> create(const ResourceRequest&, const ResourceLoaderOptions&, const String&) const = 0;
     Resource::Type type() const { return m_type; }
 
 protected:
     ResourceFactory(Resource::Type type) : m_type(type) { }
 
     Resource::Type m_type;
 };
 
 #define DEFINE_RESOURCE_TYPE_CASTS(typeName) \
     DEFINE_TYPE_CASTS(typeName##Resource, Resource, resource, resource->getType() == Resource::typeName, resource.getType() == Resource::typeName); \
-    inline typeName##Resource* to##typeName##Resource(const RefPtrWillBeRawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
+    inline typeName##Resource* to##typeName##Resource(const RawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
 
 #endif