Merge changes I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78

* changes:
  Merge WebKit at r82507: Update ThirdPartyProject.prop
  Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
  Merge WebKit at r82507: Work around a V8 bug
  Merge WebKit at r82507: JNIType renamed to JavaType
  Merge WebKit at r82507: IconDatabaseClient interface expanded
  Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
  Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
  Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
  Merge WebKit at r82507: Node::isContentEditable() renamed
  Merge WebKit at r82507: Use icon database through IconDatabaseBase
  Merge WebKit at r82507: toInputElement() is now a member of Node
  Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
  Merge WebKit at r82507: StringImpl::computeHash() removed
  Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
  Merge WebKit at r82507: Path::strokeBoundingRect() is now const
  Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
  Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
  Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
  Merge WebKit at r82507: Fix conflicts due to JNI refactoring
  Merge WebKit at r82507: Fix conflicts due to new StorageTracker
  Merge WebKit at r82507: Fix conflicts
  Merge WebKit at r82507: Fix makefiles
  Merge WebKit at r82507: Initial merge by git

1 files changed, 8 insertions, 19 deletions

diff --git a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
index 7c0bc8d..add0c05 100644
--- a/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h
@@ -36,10 +36,8 @@
 #include "InspectorDebuggerAgent.h"
 #include "PlatformString.h"
 #include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/text/StringHash.h>
 
 namespace WebCore {
 
@@ -62,19 +60,15 @@ public:
 
     virtual ~InspectorBrowserDebuggerAgent();
 
-    void setFrontend(InspectorFrontend*);
     void clearFrontend();
 
-    void setAllBrowserBreakpoints(ErrorString* error, PassRefPtr<InspectorObject>);
-    void inspectedURLChanged(const String& url);
-
     // BrowserDebugger API for InspectorFrontend
-    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);
+    void setXHRBreakpoint(ErrorString*, const String& url);
+    void removeXHRBreakpoint(ErrorString*, const String& url);
+    void setEventListenerBreakpoint(ErrorString*, const String& eventName);
+    void removeEventListenerBreakpoint(ErrorString*, const String& eventName);
+    void setDOMBreakpoint(ErrorString*, int nodeId, int type);
+    void removeDOMBreakpoint(ErrorString*, int nodeId, int type);
 
     // InspectorInstrumentation API
     void willInsertDOMNode(Node*, Node* parent);
@@ -93,11 +87,9 @@ private:
     virtual void debuggerWasDisabled();
     void disable();
 
-    void restoreStickyBreakpoint(PassRefPtr<InspectorObject> breakpoint);
-
-    void descriptionForDOMEvent(Node* target, long breakpointType, bool insertion, InspectorObject* description);
+    void descriptionForDOMEvent(Node* target, int breakpointType, bool insertion, InspectorObject* description);
     void updateSubtreeBreakpoints(Node*, uint32_t rootMask, bool set);
-    bool hasBreakpoint(Node*, long type);
+    bool hasBreakpoint(Node*, int type);
     void discardBindings();
 
     void clear();
@@ -108,9 +100,6 @@ private:
     InspectorDebuggerAgent* m_debuggerAgent;
     InspectorAgent* m_inspectorAgent;
     HashMap<Node*, uint32_t> m_domBreakpoints;
-    HashSet<String> m_eventListenerBreakpoints;
-    HashSet<String> m_XHRBreakpoints;
-    bool m_hasXHRBreakpointWithEmptyURL;
 };
 
 } // namespace WebCore