Index: Source/core/inspector/InspectorController.cpp |
diff --git a/Source/core/inspector/InspectorController.cpp b/Source/core/inspector/InspectorController.cpp |
index e4f462b3a70e63fadc263bde357aa82f8e05ed27..368579a17a34cfbd01bfadd176ffc3eaf6c0b0ca 100644 |
--- a/Source/core/inspector/InspectorController.cpp |
+++ b/Source/core/inspector/InspectorController.cpp |
@@ -33,6 +33,7 @@ |
#include "InspectorBackendDispatcher.h" |
#include "InspectorFrontend.h" |
+#include "bindings/dart/DartScriptDebugServer.h" |
#include "bindings/v8/DOMWrapperWorld.h" |
#include "core/inspector/IdentifiersFactory.h" |
#include "core/inspector/InjectedScriptHost.h" |
@@ -113,16 +114,17 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC |
m_timelineAgent = timelineAgentPtr.get(); |
m_agents.append(timelineAgentPtr.release()); |
- PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared(); |
+ UnifiedScriptDebugServer* unifiedScriptDebugServer = &UnifiedScriptDebugServer::shared(); |
+ ScriptDebugServer* scriptDebugServer = &PageScriptDebugServer::shared(); |
- m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDebugServer, m_page, m_pageAgent)); |
+ m_agents.append(PageRuntimeAgent::create(injectedScriptManager, unifiedScriptDebugServer, m_page, m_pageAgent)); |
m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent, m_timelineAgent)); |
m_agents.append(InspectorWorkerAgent::create()); |
ASSERT_ARG(inspectorClient, inspectorClient); |
- m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), pageScriptDebugServer); |
+ m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.get(), scriptDebugServer); |
} |
InspectorController::~InspectorController() |
@@ -165,9 +167,9 @@ void InspectorController::initializeDeferredAgents() |
m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); |
- PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared(); |
+ UnifiedScriptDebugServer* unifiedScriptDebugServer = &UnifiedScriptDebugServer::shared(); |
- OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pageScriptDebugServer, m_pageAgent, injectedScriptManager, overlay)); |
+ OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(unifiedScriptDebugServer, m_pageAgent, injectedScriptManager, overlay)); |
InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); |
m_agents.append(debuggerAgentPtr.release()); |
@@ -318,10 +320,10 @@ void InspectorController::inspect(Node* node) |
if (node->nodeType() != Node::ELEMENT_NODE && node->nodeType() != Node::DOCUMENT_NODE) |
node = node->parentNode(); |
- InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(V8ScriptState::forMainWorld(frame)); |
- if (injectedScript.isEmpty()) |
+ V8InjectedScript* injectedScript = static_cast<V8InjectedScript*>(&m_injectedScriptManager->injectedScriptFor(V8ScriptState::forMainWorld(frame))); |
+ if (injectedScript->isEmpty()) |
return; |
- injectedScript.inspectNode(node); |
+ injectedScript->inspectNode(node); |
} |
void InspectorController::setInjectedScriptForOrigin(const String& origin, const String& source) |