| Index: Source/core/inspector/InspectorDOMDebuggerAgent.h
|
| diff --git a/Source/core/inspector/InspectorDOMDebuggerAgent.h b/Source/core/inspector/InspectorDOMDebuggerAgent.h
|
| index d925081b03230d2f3ae27c6bc73483b67b49fbf7..183d3f4c95b8a8ed9a1315ae76dae3ab11fabd72 100644
|
| --- a/Source/core/inspector/InspectorDOMDebuggerAgent.h
|
| +++ b/Source/core/inspector/InspectorDOMDebuggerAgent.h
|
| @@ -45,6 +45,7 @@ class Document;
|
| class Element;
|
| class Event;
|
| class InspectorDOMAgent;
|
| +class InspectorDOMController;
|
| class InspectorDebuggerAgent;
|
| class InspectorFrontend;
|
| class InspectorObject;
|
| @@ -54,10 +55,10 @@ class Node;
|
|
|
| typedef String ErrorString;
|
|
|
| -class InspectorDOMDebuggerAgent : public InspectorBaseAgent<InspectorDOMDebuggerAgent>, public InspectorDebuggerAgent::Listener, public InspectorBackendDispatcher::DOMDebuggerCommandHandler {
|
| +class InspectorDOMDebuggerAgent : public InspectorBaseAgent, public InspectorDebuggerAgent::Listener, public InspectorBackendDispatcher::DOMDebuggerCommandHandler {
|
| WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
|
| public:
|
| - static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorCompositeState*, InspectorDOMAgent*, InspectorDebuggerAgent*);
|
| + static PassRefPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorDOMAgent>, PassRefPtr<InspectorDebuggerAgent>);
|
|
|
| virtual ~InspectorDOMDebuggerAgent();
|
|
|
| @@ -94,7 +95,7 @@ public:
|
| virtual void discardAgent();
|
|
|
| private:
|
| - InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorCompositeState*, InspectorDOMAgent*, InspectorDebuggerAgent*);
|
| + InspectorDOMDebuggerAgent(InstrumentingAgents*, InspectorState*, PassRefPtr<InspectorDOMAgent>, PassRefPtr<InspectorDebuggerAgent>);
|
|
|
| void pauseOnNativeEventIfNeeded(PassRefPtr<InspectorObject> eventData, bool synchronous);
|
| PassRefPtr<InspectorObject> preparePauseOnNativeEventData(bool isDOMEvent, const String& eventName);
|
| @@ -115,12 +116,24 @@ private:
|
|
|
| void clear();
|
|
|
| - InspectorDOMAgent* m_domAgent;
|
| - InspectorDebuggerAgent* m_debuggerAgent;
|
| + RefPtr<InspectorDOMAgent> m_domAgent;
|
| + RefPtr<InspectorDebuggerAgent> m_debuggerAgent;
|
| HashMap<Node*, uint32_t> m_domBreakpoints;
|
| bool m_pauseInNextEventListener;
|
| };
|
|
|
| +class InspectorDOMDebuggerController: public InspectorBaseController<InspectorDOMDebuggerController, InspectorDOMDebuggerAgent> {
|
| +public:
|
| +
|
| + static PassOwnPtr<InspectorDOMDebuggerController> create(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* compositeState, InspectorDOMController* domController, InspectorDebuggerController * debuggerController)
|
| + {
|
| + return adoptPtr(new InspectorDOMDebuggerController(instrumentingAgents, compositeState, domController, debuggerController));
|
| + }
|
| +
|
| +protected:
|
| + InspectorDOMDebuggerController(InstrumentingAgents*, InspectorCompositeState*, InspectorDOMController*, InspectorDebuggerController*);
|
| +};
|
| +
|
| } // namespace WebCore
|
|
|
|
|
|
|