Revert of Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

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 254 matching lines @@
     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 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;
+        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)
         {
         }
@@ skipping 18 matching lines @@
     ResourceLoaderOptions m_options;
 
     ResourceResponse m_response;
     double m_responseTimestamp;
 
     RefPtr<SharedBuffer> m_data;
     Timer<Resource> m_cancelTimer;
 
 private:
     class CacheHandler;
-    class ResourceCallback;
-
     void cancelTimerFired(Timer<Resource>*);
 
     void revalidationSucceeded(const ResourceResponse&);
     void revalidationFailed();
 
     size_t calculateOverheadSize() const;
 
     bool unlock();
 
     void setCachedMetadata(unsigned dataTypeID, const char*, size_t, CachedMetadataHandler::CacheType);
@@ skipping 51 matching lines @@
     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 RawPtr<Resource>& ptr) { return to##typeName##Resource(ptr.get()); }
 
 } // namespace blink
 
 #endif