Oilpan: move WorkerInspectorController's frontend channel to the heap.

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

 /*
  * 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 41 matching lines @@
 #include "core/inspector/WorkerThreadDebugger.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThread.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 namespace {
 
-class PageInspectorProxy final : public InspectorFrontendChannel {
-    USING_FAST_MALLOC(PageInspectorProxy);
-public:
-    explicit PageInspectorProxy(WorkerGlobalScope* workerGlobalScope) : m_workerGlobalScope(workerGlobalScope) { }
-    ~PageInspectorProxy() override { }
-private:
-    void sendProtocolResponse(int callId, PassRefPtr<JSONObject> message) override
-    {
-        // Worker messages are wrapped, no need to handle callId.
-        m_workerGlobalScope->thread()->workerReportingProxy().postMessageToPageInspector(message->toJSONString());
-    }
-    void sendProtocolNotification(PassRefPtr<JSONObject> message) override
-    {
-        m_workerGlobalScope->thread()->workerReportingProxy().postMessageToPageInspector(message->toJSONString());
-    }
-    void flush() override { }
-    WorkerGlobalScope* m_workerGlobalScope;
-};
-
 class WorkerStateClient final : public InspectorStateClient {
     USING_FAST_MALLOC(WorkerStateClient);
 public:
     WorkerStateClient(WorkerGlobalScope* context) { }
     ~WorkerStateClient() override { }
 
 private:
     void updateInspectorStateCookie(const String& cookie) override { }
 };
 
@@ skipping 10 matching lines @@
         while (WorkerThread::TaskReceived == m_thread->runDebuggerTask(WorkerThread::DontWaitForTask)) { }
         m_thread->didRunDebuggerTasks();
     }
 
 private:
     WorkerThread* m_thread;
 };
 
 }
 
+class WorkerInspectorController::PageInspectorProxy final : public NoBaseWillBeGarbageCollectedFinalized<WorkerInspectorController::PageInspectorProxy>, public InspectorFrontendChannel {
+    USING_FAST_MALLOC_WILL_BE_REMOVED(PageInspectorProxy);
+public:
+    static PassOwnPtrWillBeRawPtr<PageInspectorProxy> create(WorkerGlobalScope* workerGlobalScope)
+    {
+        return adoptPtrWillBeNoop(new PageInspectorProxy(workerGlobalScope));
+    }
+    ~PageInspectorProxy() override { }
+
+    DEFINE_INLINE_TRACE()
+    {
+        visitor->trace(m_workerGlobalScope);
+    }
+
+private:
+    explicit PageInspectorProxy(WorkerGlobalScope* workerGlobalScope)
+        : m_workerGlobalScope(workerGlobalScope)
+    {
+    }
+
+    void sendProtocolResponse(int callId, PassRefPtr<JSONObject> message) override
+    {
+        // Worker messages are wrapped, no need to handle callId.
+        m_workerGlobalScope->thread()->workerReportingProxy().postMessageToPageInspector(message->toJSONString());
+    }
+    void sendProtocolNotification(PassRefPtr<JSONObject> message) override
+    {
+        m_workerGlobalScope->thread()->workerReportingProxy().postMessageToPageInspector(message->toJSONString());
+    }
+    void flush() override { }
+
+    RawPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope;
+};
+
 class WorkerInjectedScriptHostClient: public InjectedScriptHostClient {
 public:
     WorkerInjectedScriptHostClient() { }
 
     ~WorkerInjectedScriptHostClient() override { }
 };
 
 WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGlobalScope)
     : m_workerGlobalScope(workerGlobalScope)
     , m_stateClient(adoptPtr(new WorkerStateClient(workerGlobalScope)))
@@ skipping 34 matching lines @@
 
 void WorkerInspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAgent> agent)
 {
     m_agents.append(agent);
 }
 
 void WorkerInspectorController::connectFrontend()
 {
     ASSERT(!m_frontend);
     m_state->unmute();
-    m_frontendChannel = adoptPtr(new PageInspectorProxy(m_workerGlobalScope));
-    m_frontend = adoptPtr(new InspectorFrontend(m_frontendChannel.get()));
-    m_backendDispatcher = InspectorBackendDispatcher::create(m_frontendChannel.get());
+    m_pageInspectorProxy = PageInspectorProxy::create(m_workerGlobalScope);
+    m_frontend = adoptPtr(new InspectorFrontend(frontendChannel()));
+    m_backendDispatcher = InspectorBackendDispatcher::create(frontendChannel());
     m_agents.registerInDispatcher(m_backendDispatcher.get());
     m_agents.setFrontend(m_frontend.get());
     InspectorInstrumentation::frontendCreated();
 }
 
 void WorkerInspectorController::disconnectFrontend()
 {
     if (!m_frontend)
         return;
     m_backendDispatcher->clearFrontend();
     m_backendDispatcher.clear();
     // Destroying agents would change the state, but we don't want that.
     // Pre-disconnect state will be used to restore inspector agents.
     m_state->mute();
     m_agents.clearFrontend();
     m_frontend.clear();
     InspectorInstrumentation::frontendDeleted();
-    m_frontendChannel.clear();
+    m_pageInspectorProxy.clear();
 }
 
 void WorkerInspectorController::restoreInspectorStateFromCookie(const String& inspectorCookie)
 {
     ASSERT(!m_frontend);
     connectFrontend();
     m_state->loadFromCookie(inspectorCookie);
 
     m_agents.restore();
 }
@@ skipping 20 matching lines @@
 {
     if (m_paused)
         m_workerThreadDebugger->quitMessageLoopOnPause();
 }
 
 bool WorkerInspectorController::isRunRequired()
 {
     return m_paused;
 }
 
+InspectorFrontendChannel* WorkerInspectorController::frontendChannel() const
+{
+    return static_cast<InspectorFrontendChannel*>(m_pageInspectorProxy.get());
+}
+
 void WorkerInspectorController::workerContextInitialized(bool shouldPauseOnStart)
 {
     m_beforeInitlizedScope.clear();
     if (shouldPauseOnStart)
         pauseOnStart();
 }
 
 void WorkerInspectorController::pauseOnStart()
 {
     m_paused = true;
     m_workerThreadDebugger->runMessageLoopOnPause(WorkerThreadDebugger::contextGroupId());
     m_paused = false;
 }
 
 DEFINE_TRACE(WorkerInspectorController)
 {
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_state);
     visitor->trace(m_instrumentingAgents);
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_backendDispatcher);
     visitor->trace(m_agents);
+    visitor->trace(m_pageInspectorProxy);
     visitor->trace(m_workerDebuggerAgent);
     visitor->trace(m_workerRuntimeAgent);
 }
 
 } // namespace blink