Index: third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp |
diff --git a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp |
index 01f5d3c60ae23521bb8149b842ccde838fcdb2db..45cd166fd0d5905113e4cc14dbc5cc0f35e8f094 100644 |
--- a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp |
+++ b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp |
@@ -39,8 +39,6 @@ |
#include "core/inspector/InspectorHeapProfilerAgent.h" |
#include "core/inspector/InspectorInstrumentation.h" |
#include "core/inspector/InspectorProfilerAgent.h" |
-#include "core/inspector/InspectorState.h" |
-#include "core/inspector/InspectorStateClient.h" |
#include "core/inspector/InspectorTaskRunner.h" |
#include "core/inspector/InspectorTimelineAgent.h" |
#include "core/inspector/InstrumentingAgents.h" |
@@ -57,16 +55,6 @@ namespace blink { |
namespace { |
-class WorkerStateClient final : public InspectorStateClient { |
- USING_FAST_MALLOC(WorkerStateClient); |
-public: |
- WorkerStateClient(WorkerGlobalScope* context) { } |
- ~WorkerStateClient() override { } |
- |
-private: |
- void updateInspectorStateCookie(const String& cookie) override { } |
-}; |
- |
class RunInspectorCommandsTask final : public InspectorTaskRunner::Task { |
public: |
explicit RunInspectorCommandsTask(WorkerThread* thread) |
@@ -130,12 +118,10 @@ public: |
WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGlobalScope) |
: m_workerGlobalScope(workerGlobalScope) |
- , m_stateClient(adoptPtr(new WorkerStateClient(workerGlobalScope))) |
- , m_state(adoptPtr(new InspectorCompositeState(m_stateClient.get()))) |
, m_instrumentingAgents(InstrumentingAgents::create()) |
, m_injectedScriptManager(InjectedScriptManager::createForWorker()) |
, m_workerThreadDebugger(adoptPtr(new WorkerThreadDebugger(workerGlobalScope->thread()))) |
- , m_agents(m_instrumentingAgents.get(), m_state.get()) |
+ , m_agents(m_instrumentingAgents.get()) |
, m_inspectorTaskRunner(adoptPtr(new InspectorTaskRunner(v8::Isolate::GetCurrent()))) |
, m_beforeInitlizedScope(adoptPtr(new InspectorTaskRunner::IgnoreInterruptsScope(m_inspectorTaskRunner.get()))) |
, m_paused(false) |
@@ -179,7 +165,6 @@ void WorkerInspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<Inspe |
void WorkerInspectorController::connectFrontend() |
{ |
ASSERT(!m_frontend); |
- m_state->unmute(); |
m_pageInspectorProxy = PageInspectorProxy::create(m_workerGlobalScope); |
m_frontend = adoptPtr(new InspectorFrontend(frontendChannel())); |
m_backendDispatcher = InspectorBackendDispatcher::create(frontendChannel()); |
@@ -194,9 +179,6 @@ void WorkerInspectorController::disconnectFrontend() |
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(); |
@@ -207,9 +189,7 @@ void WorkerInspectorController::restoreInspectorStateFromCookie(const String& in |
{ |
ASSERT(!m_frontend); |
connectFrontend(); |
- m_state->loadFromCookie(inspectorCookie); |
- |
- m_agents.restore(); |
+ m_agents.restore(inspectorCookie); |
} |
void WorkerInspectorController::dispatchMessageFromFrontend(const String& message) |