Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 32 insertions, 11 deletions

diff --git a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
index fac54bb..7c0bc8d 100644
--- a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
@@ -33,8 +33,8 @@
 
 #if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
 
+#include "InspectorDebuggerAgent.h"
 #include "PlatformString.h"
-
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/PassOwnPtr.h>
@@ -45,26 +45,36 @@ namespace WebCore {
 
 class Element;
 class InspectorAgent;
+class InspectorDOMAgent;
+class InspectorDebuggerAgent;
+class InspectorFrontend;
 class InspectorObject;
+class InspectorState;
+class InstrumentingAgents;
 class Node;
 
-class InspectorBrowserDebuggerAgent {
+typedef String ErrorString;
+
+class InspectorBrowserDebuggerAgent : public InspectorDebuggerAgent::Listener {
     WTF_MAKE_NONCOPYABLE(InspectorBrowserDebuggerAgent);
 public:
-    static PassOwnPtr<InspectorBrowserDebuggerAgent> create(InspectorAgent*, bool eraseStickyBreakpoints);
+    static PassOwnPtr<InspectorBrowserDebuggerAgent> create(InstrumentingAgents*, InspectorState*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
 
     virtual ~InspectorBrowserDebuggerAgent();
 
-    void setAllBrowserBreakpoints(PassRefPtr<InspectorObject>);
+    void setFrontend(InspectorFrontend*);
+    void clearFrontend();
+
+    void setAllBrowserBreakpoints(ErrorString* error, PassRefPtr<InspectorObject>);
     void inspectedURLChanged(const String& url);
 
     // BrowserDebugger API for InspectorFrontend
-    void setXHRBreakpoint(const String& url);
-    void removeXHRBreakpoint(const String& url);
-    void setEventListenerBreakpoint(const String& eventName);
-    void removeEventListenerBreakpoint(const String& eventName);
-    void setDOMBreakpoint(long nodeId, long type);
-    void removeDOMBreakpoint(long nodeId, long type);
+    void setXHRBreakpoint(ErrorString* error, const String& url);
+    void removeXHRBreakpoint(ErrorString* error, const String& url);
+    void setEventListenerBreakpoint(ErrorString* error, const String& eventName);
+    void removeEventListenerBreakpoint(ErrorString* error, const String& eventName);
+    void setDOMBreakpoint(ErrorString* error, long nodeId, long type);
+    void removeDOMBreakpoint(ErrorString* error, long nodeId, long type);
 
     // InspectorInstrumentation API
     void willInsertDOMNode(Node*, Node* parent);
@@ -76,7 +86,12 @@ public:
     void pauseOnNativeEventIfNeeded(const String& categoryType, const String& eventName, bool synchronous);
 
 private:
-    InspectorBrowserDebuggerAgent(InspectorAgent*, bool eraseStickyBreakpoints);
+    InspectorBrowserDebuggerAgent(InstrumentingAgents*, InspectorState*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
+
+    // InspectorDebuggerAgent::Listener implementation.
+    virtual void debuggerWasEnabled();
+    virtual void debuggerWasDisabled();
+    void disable();
 
     void restoreStickyBreakpoint(PassRefPtr<InspectorObject> breakpoint);
 
@@ -85,6 +100,12 @@ private:
     bool hasBreakpoint(Node*, long type);
     void discardBindings();
 
+    void clear();
+
+    InstrumentingAgents* m_instrumentingAgents;
+    InspectorState* m_inspectorState;
+    InspectorDOMAgent* m_domAgent;
+    InspectorDebuggerAgent* m_debuggerAgent;
     InspectorAgent* m_inspectorAgent;
     HashMap<Node*, uint32_t> m_domBreakpoints;
     HashSet<String> m_eventListenerBreakpoints;