Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
index c42961915a822cbe81384f9b8cb36a970eef1b7a..94980775d98a2de1b8947890529933b4508a4409 100644 |
--- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
@@ -316,7 +316,6 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl( |
, m_hasBeenDisposed(false) |
#endif |
, m_instrumentingAgents(m_webLocalFrameImpl->frame()->instrumentingAgents()) |
- , m_injectedScriptManager(InjectedScriptManager::createForPage()) |
, m_resourceContentLoader(InspectorResourceContentLoader::create(m_webLocalFrameImpl->frame())) |
, m_overlay(overlay) |
, m_inspectedFrames(InspectedFrames::create(m_webLocalFrameImpl->frame())) |
@@ -339,6 +338,10 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl( |
long processId = Platform::current()->getUniqueIdForProcess(); |
ASSERT(processId > 0); |
IdentifiersFactory::setProcessId(processId); |
+ |
+ ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client); |
+ MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); |
+ m_injectedScriptManager = InjectedScriptManager::create(mainThreadDebugger); |
InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get(); |
OwnPtrWillBeRawPtr<InspectorInspectorAgent> inspectorAgentPtr(InspectorInspectorAgent::create(injectedScriptManager)); |
@@ -355,9 +358,6 @@ WebDevToolsAgentImpl::WebDevToolsAgentImpl( |
m_agents.append(InspectorTimelineAgent::create()); |
- ClientMessageLoopAdapter::ensureMainThreadDebuggerCreated(m_client); |
- MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); |
- |
OwnPtrWillBeRawPtr<PageRuntimeAgent> pageRuntimeAgentPtr(PageRuntimeAgent::create(injectedScriptManager, this, mainThreadDebugger->debugger(), m_inspectedFrames.get())); |
m_pageRuntimeAgent = pageRuntimeAgentPtr.get(); |
m_agents.append(pageRuntimeAgentPtr.release()); |