Oilpan: Remove raw pointer to ExecutionContext from WorkerInspectorProxy

Source/core/inspector/InspectorWorkerAgent.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef InspectorWorkerAgent_h
 #define InspectorWorkerAgent_h
 
 #include "core/CoreExport.h"
 #include "core/InspectorFrontend.h"
 #include "core/inspector/InspectorBaseAgent.h"
+#include "core/workers/WorkerInspectorProxy.h"
 #include "wtf/Forward.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 class PageConsoleAgent;
 class KURL;
 class WorkerInspectorProxy;
 
 typedef String ErrorString;
 
 class CORE_EXPORT InspectorWorkerAgent final : public InspectorBaseAgent<InspectorWorkerAgent, InspectorFrontend::Worker>, public InspectorBackendDispatcher::WorkerCommandHandler {
+    WTF_MAKE_NONCOPYABLE(InspectorWorkerAgent);
 public:
     static PassOwnPtrWillBeRawPtr<InspectorWorkerAgent> create(PageConsoleAgent*);
     ~InspectorWorkerAgent() override;
     DECLARE_VIRTUAL_TRACE();
 
     void init() override;
     void disable(ErrorString*) override;
     void restore() override;
 
     // Called from InspectorInstrumentation
     bool shouldPauseDedicatedWorkerOnStart();
     void didStartWorker(WorkerInspectorProxy*, const KURL&);
     void workerTerminated(WorkerInspectorProxy*);
 
     // Called from InspectorBackendDispatcher
     void enable(ErrorString*) override;
     void connectToWorker(ErrorString*, const String& workerId) override;
     void disconnectFromWorker(ErrorString*, const String& workerId) override;
     void sendMessageToWorker(ErrorString*, const String& workerId, const String& message) override;
     void setAutoconnectToWorkers(ErrorString*, bool value) override;
 
     void setTracingSessionId(const String&);
 
+    class WorkerAgentClient final : public WorkerInspectorProxy::PageInspector {
+        WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(InspectorWorkerAgent::WorkerAgentClient);
+    public:
+        static PassOwnPtrWillBeRawPtr<WorkerAgentClient> create(InspectorFrontend::Worker*, WorkerInspectorProxy*, const String& id, PageConsoleAgent*);
+        WorkerAgentClient(InspectorFrontend::Worker*, WorkerInspectorProxy*, const String& id, PageConsoleAgent*);
+        ~WorkerAgentClient() override;
+        DECLARE_VIRTUAL_TRACE();
+
+        String id() const { return m_id; }
+        WorkerInspectorProxy* proxy() const { return m_proxy; }
+
+        void connectToWorker();
+        void dispose();
+
+    private:
+        // WorkerInspectorProxy::PageInspector implementation
+        void dispatchMessageFromWorker(const String& message) override;
+        void workerConsoleAgentEnabled(WorkerGlobalScopeProxy*) override;
+
+        InspectorFrontend::Worker* m_frontend;
+        RawPtrWillBeMember<WorkerInspectorProxy> m_proxy;
+        String m_id;
+        bool m_connected;
+        RawPtrWillBeMember<PageConsoleAgent> m_consoleAgent;
+    };
+
 private:
     InspectorWorkerAgent(PageConsoleAgent*);
     void createWorkerAgentClientsForExistingWorkers();
     void createWorkerAgentClient(WorkerInspectorProxy*, const String& url, const String& id);
     void destroyWorkerAgentClients();
 
     class WorkerInfo {
     public:
         WorkerInfo() { }
         WorkerInfo(const String& url, const String& id) : url(url), id(id) { }
         String url;
         String id;
     };
-    class WorkerAgentClient;
-    typedef HashMap<String, WorkerAgentClient*> WorkerClients;
+
+    typedef WillBeHeapHashMap<String, OwnPtrWillBeMember<WorkerAgentClient>> WorkerClients;
     WorkerClients m_idToClient;
     typedef HashMap<WorkerInspectorProxy*, WorkerInfo> WorkerInfos;
     WorkerInfos m_workerInfos;
     String m_tracingSessionId;
     RawPtrWillBeMember<PageConsoleAgent> m_consoleAgent;
 };
 
 } // namespace blink
 
 #endif // !defined(InspectorWorkerAgent_h)