Oilpan: tidy up InspectorResourceContentLoader's ResourceClient handling.

third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

 // Copyright 2014 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.
 
 #include "config.h"
 #include "core/inspector/InspectorResourceContentLoader.h"
 
 #include "core/css/CSSStyleSheet.h"
 #include "core/css/StyleSheetContents.h"
 #include "core/dom/Document.h"
 #include "core/fetch/CSSStyleSheetResource.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/fetch/RawResource.h"
 #include "core/fetch/Resource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/fetch/ResourcePtr.h"
 #include "core/fetch/StyleSheetResourceClient.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorCSSAgent.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/page/Page.h"
 #include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
-class InspectorResourceContentLoader::ResourceClient final : private RawResourceClient, private StyleSheetResourceClient {
+class InspectorResourceContentLoader::ResourceClient final : public NoBaseWillBeGarbageCollectedFinalized<InspectorResourceContentLoader::ResourceClient>, private RawResourceClient, private StyleSheetResourceClient {
 public:
-    ResourceClient(InspectorResourceContentLoader* loader)
+    explicit ResourceClient(InspectorResourceContentLoader* loader)
         : m_loader(loader)
     {
     }
 
     void waitForResource(Resource* resource)
     {
         if (resource->type() == Resource::Raw)
             resource->addClient(static_cast<RawResourceClient*>(this));
         else
             resource->addClient(static_cast<StyleSheetResourceClient*>(this));
     }
 
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_loader);
+    }
+
 private:
-    InspectorResourceContentLoader* m_loader;
+    RawPtrWillBeMember<InspectorResourceContentLoader> m_loader;
 
     void setCSSStyleSheet(const String&, const KURL&, const String&, const CSSStyleSheetResource*) override;
     void notifyFinished(Resource*) override;
     String debugName() const override { return "InspectorResourceContentLoader::ResourceClient"; }
     void resourceFinished(Resource*);
 
     friend class InspectorResourceContentLoader;
 };
 
 void InspectorResourceContentLoader::ResourceClient::resourceFinished(Resource* resource)
 {
     if (m_loader)
         m_loader->resourceFinished(this);
 
     if (resource->type() == Resource::Raw)
         resource->removeClient(static_cast<RawResourceClient*>(this));
     else
         resource->removeClient(static_cast<StyleSheetResourceClient*>(this));
 
+#if !ENABLE(OILPAN)
     delete this;
+#endif
 }
 
 void InspectorResourceContentLoader::ResourceClient::setCSSStyleSheet(const String&, const KURL& url, const String&, const CSSStyleSheetResource* resource)
 {
     resourceFinished(const_cast<CSSStyleSheetResource*>(resource));
 }
 
 void InspectorResourceContentLoader::ResourceClient::notifyFinished(Resource* resource)
 {
     if (resource->type() == Resource::CSSStyleSheet)
@@ skipping 77 matching lines @@
     checkDone();
 }
 
 InspectorResourceContentLoader::~InspectorResourceContentLoader()
 {
     ASSERT(m_resources.isEmpty());
 }
 
 DEFINE_TRACE(InspectorResourceContentLoader)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_inspectedFrame);
+    visitor->trace(m_pendingResourceClients);
+#endif
 }
 
 void InspectorResourceContentLoader::didCommitLoadForLocalFrame(LocalFrame* frame)
 {
     if (frame == m_inspectedFrame)
         stop();
 }
 
 void InspectorResourceContentLoader::dispose()
 {
     stop();
 }
 
 void InspectorResourceContentLoader::stop()
 {
-    HashSet<ResourceClient*> pendingResourceClients;
+    WillBeHeapHashSet<RawPtrWillBeMember<ResourceClient>> pendingResourceClients;
     m_pendingResourceClients.swap(pendingResourceClients);
     for (const auto& client : pendingResourceClients)
         client->m_loader = nullptr;
     m_resources.clear();
     // Make sure all callbacks are called to prevent infinite waiting time.
     checkDone();
     m_allRequestsStarted = false;
     m_started = false;
 }
 
@@ skipping 12 matching lines @@
         (*callback)();
 }
 
 void InspectorResourceContentLoader::resourceFinished(ResourceClient* client)
 {
     m_pendingResourceClients.remove(client);
     checkDone();
 }
 
 } // namespace blink