Index: Source/core/inspector/PageDebuggerAgent.cpp |
diff --git a/Source/core/inspector/PageDebuggerAgent.cpp b/Source/core/inspector/PageDebuggerAgent.cpp |
index 72bd983efa425e8384062f4341f8320a1a9c427d..a261167b9c3a7baa2c1166a6a5afdf3748da8799 100644 |
--- a/Source/core/inspector/PageDebuggerAgent.cpp |
+++ b/Source/core/inspector/PageDebuggerAgent.cpp |
@@ -41,12 +41,12 @@ |
namespace WebCore { |
-PassOwnPtr<PageDebuggerAgent> PageDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* inspectorState, PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) |
+PassRefPtr<PageDebuggerAgent> PageDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, PageScriptDebugServer* pageScriptDebugServer, PassRefPtr<InspectorPageAgent> pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) |
{ |
- return adoptPtr(new PageDebuggerAgent(instrumentingAgents, inspectorState, pageScriptDebugServer, pageAgent, injectedScriptManager, overlay)); |
+ return adoptRef(new PageDebuggerAgent(instrumentingAgents, inspectorState, pageScriptDebugServer, pageAgent, injectedScriptManager, overlay)); |
} |
-PageDebuggerAgent::PageDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* inspectorState, PageScriptDebugServer* pageScriptDebugServer, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) |
+PageDebuggerAgent::PageDebuggerAgent(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, PageScriptDebugServer* pageScriptDebugServer, PassRefPtr<InspectorPageAgent> pageAgent, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) |
: InspectorDebuggerAgent(instrumentingAgents, inspectorState, injectedScriptManager) |
, m_pageScriptDebugServer(pageScriptDebugServer) |
, m_pageAgent(pageAgent) |
@@ -139,5 +139,11 @@ void PageDebuggerAgent::didClearWindowObjectInWorld(Frame* frame, DOMWrapperWorl |
scriptDebugServer().setScriptPreprocessor(m_pageAgent->scriptPreprocessor()); |
} |
+PageDebuggerController::PageDebuggerController(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, PageScriptDebugServer* pageScriptDebugServer, InspectorPageController* pageController, InjectedScriptManager* injectedScriptManager, InspectorOverlay* overlay) |
+ : InspectorDebuggerController(instrumentingAgents, compositeState) |
+{ |
+ setAgent(PageDebuggerAgent::create(m_instrumentingAgents, m_state, pageScriptDebugServer, pageController->getAgent(), injectedScriptManager, overlay)); |
+} |
+ |
} // namespace WebCore |