2011-03-14 Sheriff Bot <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r81026.
        http://trac.webkit.org/changeset/81026
        https://bugs.webkit.org/show_bug.cgi?id=56313

        Breaks gtk 64-bit tests (Requested by podivilov on #webkit).

        * inspector/debugger/xhr-breakpoints-expected.txt: Removed.
        * inspector/debugger/xhr-breakpoints.html: Removed.
        * platform/gtk/Skipped:
        * platform/mac/Skipped:
        * platform/qt/Skipped:
        * platform/win/Skipped:
2011-03-14  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r81026.
        http://trac.webkit.org/changeset/81026
        https://bugs.webkit.org/show_bug.cgi?id=56313

        Breaks gtk 64-bit tests (Requested by podivilov on #webkit).

        * inspector/InspectorBrowserDebuggerAgent.cpp:
        (WebCore::InspectorBrowserDebuggerAgent::InspectorBrowserDebuggerAgent):
        (WebCore::InspectorBrowserDebuggerAgent::inspectedURLChanged):
        (WebCore::InspectorBrowserDebuggerAgent::restoreStickyBreakpoint):
        (WebCore::InspectorBrowserDebuggerAgent::setXHRBreakpoint):
        (WebCore::InspectorBrowserDebuggerAgent::removeXHRBreakpoint):
        (WebCore::InspectorBrowserDebuggerAgent::willSendXMLHttpRequest):
        (WebCore::InspectorBrowserDebuggerAgent::clear):
        * inspector/InspectorBrowserDebuggerAgent.h:
        * inspector/front-end/BreakpointManager.js:
        (WebInspector.BreakpointManager.prototype.createXHRBreakpoint):
        (WebInspector.BreakpointManager.prototype._createXHRBreakpoint):
        (WebInspector.BreakpointManager.prototype.breakpointViewForEventData):
        (WebInspector.BreakpointManager.prototype._projectChanged):
        (WebInspector.BreakpointManager.prototype._validateBreakpoints):
        (WebInspector.BreakpointManager.prototype._createEventListenerBreakpointId):
        (WebInspector.BreakpointManager.prototype._createXHRBreakpointId):
        (WebInspector.XHRBreakpoint):
        (WebInspector.XHRBreakpoint.prototype._enable):
        (WebInspector.XHRBreakpoint.prototype._disable):
        (WebInspector.XHRBreakpoint.prototype._serializeToJSON):
        (WebInspector.XHRBreakpointView):
        (WebInspector.XHRBreakpointView.prototype.compareTo):
        (WebInspector.XHRBreakpointView.prototype.populateEditElement):
        (WebInspector.XHRBreakpointView.prototype.populateLabelElement):
        (WebInspector.XHRBreakpointView.prototype.populateStatusMessageElement):
        * inspector/front-end/BreakpointsSidebarPane.js:
        (WebInspector.XHRBreakpointsSidebarPane.addButtonClicked):
        (WebInspector.XHRBreakpointsSidebarPane):
        (WebInspector.XHRBreakpointsSidebarPane.prototype.addBreakpointItem):
        (WebInspector.XHRBreakpointsSidebarPane.prototype._startEditingBreakpoint):
        (WebInspector.XHRBreakpointsSidebarPane.prototype._hideEditBreakpointDialog):
        * inspector/front-end/CallStackSidebarPane.js:
        (WebInspector.CallStackSidebarPane.prototype.update):
        * inspector/front-end/ScriptsPanel.js:
        (WebInspector.ScriptsPanel):
        (WebInspector.ScriptsPanel.prototype._debuggerPaused):
        (WebInspector.ScriptsPanel.prototype._clearInterface):
        * inspector/front-end/Settings.js:
        (WebInspector.Settings):
        * inspector/front-end/inspector.js:
        (WebInspector.resetFocusElement):
        (WebInspector.createXHRBreakpointsSidebarPane.breakpointAdded):
        (WebInspector.createXHRBreakpointsSidebarPane):
        (WebInspector.set attached):

git-svn-id: svn://svn.chromium.org/blink/trunk@81030 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/ChangeLog

+2011-03-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r81026.
+        http://trac.webkit.org/changeset/81026
+        https://bugs.webkit.org/show_bug.cgi?id=56313
+
+        Breaks gtk 64-bit tests (Requested by podivilov on #webkit).
+
+        * inspector/debugger/xhr-breakpoints-expected.txt: Removed.
+        * inspector/debugger/xhr-breakpoints.html: Removed.
+        * platform/gtk/Skipped:
+        * platform/mac/Skipped:
+        * platform/qt/Skipped:
+        * platform/win/Skipped:
+
 2011-03-14  Mikhail Naganov  <mnaganov@chromium.org>
 
         Reviewed by Pavel Feldman.

third_party/WebKit/LayoutTests/inspector/debugger/xhr-breakpoints-expected.txt

-Tests XHR breakpoints.
-
-Debugger was enabled.
-
-Running: testXHRBreakpoint
-Script execution paused.
-Call stack:
-    0) sendRequest (xhr-breakpoints.html:11)
-    1)  (:1)
-Script execution resumed.
-
-Running: testPauseOnAnyXHR
-Debugger was disabled.
-

third_party/WebKit/LayoutTests/inspector/debugger/xhr-breakpoints.html

-<html>
-<head>
-<script src="../../http/tests/inspector/inspector-test.js"></script>
-<script src="../../http/tests/inspector/debugger-test.js"></script>
-<script>
-
-function sendRequest(url)
-{
-    var request = new XMLHttpRequest();
-    request.open("GET", url, true);
-    request.send()
-}
-
-function test()
-{
-    var pane = WebInspector.panels.scripts.sidebarPanes.xhrBreakpoints;
-    InspectorTest.runDebuggerTestSuite([
-        function testXHRBreakpoint(next)
-        {
-            pane._setBreakpoint("foo", true);
-            InspectorTest.waitUntilPaused(step1);
-            InspectorTest.evaluateInPageWithTimeout("sendRequest('/foo?a=b')");
-
-            function step1(callFrames)
-            {
-                InspectorTest.captureStackTrace(callFrames);
-                InspectorTest.resumeExecution(step2);
-            }
-
-            function step2()
-            {
-                InspectorTest.evaluateInPage("sendRequest('/bar?a=b')", step3);
-            }
-
-            function step3()
-            {
-                pane._removeBreakpoint("foo");
-                InspectorTest.evaluateInPage("sendRequest('/foo?a=b')", next);
-            }
-        },
-
-        function testPauseOnAnyXHR(next)
-        {
-            pane._setBreakpoint("");
-            InspectorTest.evaluateInPage("sendRequest('/foo?a=b')", pausedFoo);
-
-            function pausedFoo(callFrames)
-            {
-                function resumed()
-                {
-                    InspectorTest.evaluateInPage("sendRequest('/bar?a=b')", pausedBar);
-                }
-                InspectorTest.resumeExecution(resumed);
-            }
-
-            function pausedBar(callFrames)
-            {
-                function resumed()
-                {
-                    pane._removeBreakpoint("");
-                    InspectorTest.evaluateInPage("sendRequest('/baz?a=b')", next);
-                }
-                InspectorTest.resumeExecution(resumed);
-            }
-        }
-    ]);
-}
-
-</script>
-</head>
-
-<body onload="runTest()">
-<p>
-Tests XHR breakpoints.
-</p>
-
-</body>
-</html>

third_party/WebKit/LayoutTests/platform/gtk/Skipped

@@ -1183,7 +1183,6 @@ sputnik/Unicode/Unicode_510/S7.6_A5.3_T2.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=43332
 inspector/debugger/dom-breakpoints.html
-inspector/debugger/xhr-breakpoints.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html

third_party/WebKit/LayoutTests/platform/mac/Skipped

@@ -233,7 +233,6 @@ animations/play-state.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=43332
 inspector/debugger/dom-breakpoints.html
-inspector/debugger/xhr-breakpoints.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html

third_party/WebKit/LayoutTests/platform/qt/Skipped

@@ -104,7 +104,6 @@ fast/text/hyphens.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=43332
 inspector/debugger/dom-breakpoints.html
-inspector/debugger/xhr-breakpoints.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html

third_party/WebKit/LayoutTests/platform/win/Skipped

@@ -1092,7 +1092,6 @@ http/tests/appcache/origin-quota.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=43332
 inspector/debugger/dom-breakpoints.html
-inspector/debugger/xhr-breakpoints.html
 
 # https://bugs.webkit.org/show_bug.cgi?id=40300
 inspector/debugger/live-edit.html

third_party/WebKit/Source/WebCore/ChangeLog

+2011-03-14  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r81026.
+        http://trac.webkit.org/changeset/81026
+        https://bugs.webkit.org/show_bug.cgi?id=56313
+
+        Breaks gtk 64-bit tests (Requested by podivilov on #webkit).
+
+        * inspector/InspectorBrowserDebuggerAgent.cpp:
+        (WebCore::InspectorBrowserDebuggerAgent::InspectorBrowserDebuggerAgent):
+        (WebCore::InspectorBrowserDebuggerAgent::inspectedURLChanged):
+        (WebCore::InspectorBrowserDebuggerAgent::restoreStickyBreakpoint):
+        (WebCore::InspectorBrowserDebuggerAgent::setXHRBreakpoint):
+        (WebCore::InspectorBrowserDebuggerAgent::removeXHRBreakpoint):
+        (WebCore::InspectorBrowserDebuggerAgent::willSendXMLHttpRequest):
+        (WebCore::InspectorBrowserDebuggerAgent::clear):
+        * inspector/InspectorBrowserDebuggerAgent.h:
+        * inspector/front-end/BreakpointManager.js:
+        (WebInspector.BreakpointManager.prototype.createXHRBreakpoint):
+        (WebInspector.BreakpointManager.prototype._createXHRBreakpoint):
+        (WebInspector.BreakpointManager.prototype.breakpointViewForEventData):
+        (WebInspector.BreakpointManager.prototype._projectChanged):
+        (WebInspector.BreakpointManager.prototype._validateBreakpoints):
+        (WebInspector.BreakpointManager.prototype._createEventListenerBreakpointId):
+        (WebInspector.BreakpointManager.prototype._createXHRBreakpointId):
+        (WebInspector.XHRBreakpoint):
+        (WebInspector.XHRBreakpoint.prototype._enable):
+        (WebInspector.XHRBreakpoint.prototype._disable):
+        (WebInspector.XHRBreakpoint.prototype._serializeToJSON):
+        (WebInspector.XHRBreakpointView):
+        (WebInspector.XHRBreakpointView.prototype.compareTo):
+        (WebInspector.XHRBreakpointView.prototype.populateEditElement):
+        (WebInspector.XHRBreakpointView.prototype.populateLabelElement):
+        (WebInspector.XHRBreakpointView.prototype.populateStatusMessageElement):
+        * inspector/front-end/BreakpointsSidebarPane.js:
+        (WebInspector.XHRBreakpointsSidebarPane.addButtonClicked):
+        (WebInspector.XHRBreakpointsSidebarPane):
+        (WebInspector.XHRBreakpointsSidebarPane.prototype.addBreakpointItem):
+        (WebInspector.XHRBreakpointsSidebarPane.prototype._startEditingBreakpoint):
+        (WebInspector.XHRBreakpointsSidebarPane.prototype._hideEditBreakpointDialog):
+        * inspector/front-end/CallStackSidebarPane.js:
+        (WebInspector.CallStackSidebarPane.prototype.update):
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel):
+        (WebInspector.ScriptsPanel.prototype._debuggerPaused):
+        (WebInspector.ScriptsPanel.prototype._clearInterface):
+        * inspector/front-end/Settings.js:
+        (WebInspector.Settings):
+        * inspector/front-end/inspector.js:
+        (WebInspector.resetFocusElement):
+        (WebInspector.createXHRBreakpointsSidebarPane.breakpointAdded):
+        (WebInspector.createXHRBreakpointsSidebarPane):
+        (WebInspector.set attached):
+
 2011-03-14  Mikhail Naganov  <mnaganov@chromium.org>
 
         Reviewed by Pavel Feldman.

third_party/WebKit/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.cpp

@@ -65,8 +65,6 @@ namespace WebCore {
 
 namespace BrowserDebuggerAgentState {
 static const char browserBreakpoints[] = "browserBreakpoints";
-static const char pauseOnAllXHRs[] = "pauseOnAllXHRs";
-static const char xhrBreakpoints[] = "xhrBreakpoints";
 }
 
 PassOwnPtr<InspectorBrowserDebuggerAgent> InspectorBrowserDebuggerAgent::create(InstrumentingAgents* instrumentingAgents, InspectorState* inspectorState, InspectorDOMAgent* domAgent, InspectorDebuggerAgent* debuggerAgent, InspectorAgent* inspectorAgent)
@@ -80,6 +78,7 @@ InspectorBrowserDebuggerAgent::InspectorBrowserDebuggerAgent(InstrumentingAgents
     , m_domAgent(domAgent)
     , m_debuggerAgent(debuggerAgent)
     , m_inspectorAgent(inspectorAgent)
+    , m_hasXHRBreakpointWithEmptyURL(false)
 {
     m_debuggerAgent->setListener(this);
 }
@@ -129,6 +128,8 @@ void InspectorBrowserDebuggerAgent::setAllBrowserBreakpoints(ErrorString*, PassR
 void InspectorBrowserDebuggerAgent::inspectedURLChanged(const String& url)
 {
     m_eventListenerBreakpoints.clear();
+    m_XHRBreakpoints.clear();
+    m_hasXHRBreakpointWithEmptyURL = false;
 
     RefPtr<InspectorObject> allBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::browserBreakpoints);
     RefPtr<InspectorArray> breakpoints = allBreakpoints->getArray(url);
@@ -160,6 +161,13 @@ void InspectorBrowserDebuggerAgent::restoreStickyBreakpoint(PassRefPtr<Inspector
         if (!condition->getString("eventName", &eventName))
             return;
         setEventListenerBreakpoint(&error, eventName);
+    } else if (type == xhrNativeBreakpointType) {
+        if (!enabled)
+            return;
+        String url;
+        if (!condition->getString("url", &url))
+            return;
+        setXHRBreakpoint(&error, url);
     }
 }
 
@@ -362,26 +370,18 @@ void InspectorBrowserDebuggerAgent::pauseOnNativeEventIfNeeded(const String& cat
 
 void InspectorBrowserDebuggerAgent::setXHRBreakpoint(ErrorString*, const String& url)
 {
-    if (url.isEmpty()) {
-        m_inspectorState->setBoolean(BrowserDebuggerAgentState::pauseOnAllXHRs, true);
-        return;
-    }
-
-    RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::xhrBreakpoints);
-    xhrBreakpoints->setBoolean(url, true);
-    m_inspectorState->setObject(BrowserDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
+    if (url.isEmpty())
+        m_hasXHRBreakpointWithEmptyURL = true;
+    else
+        m_XHRBreakpoints.add(url);
 }
 
 void InspectorBrowserDebuggerAgent::removeXHRBreakpoint(ErrorString*, const String& url)
 {
-    if (url.isEmpty()) {
-        m_inspectorState->setBoolean(BrowserDebuggerAgentState::pauseOnAllXHRs, false);
-        return;
-    }
-
-    RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::xhrBreakpoints);
-    xhrBreakpoints->remove(url);
-    m_inspectorState->setObject(BrowserDebuggerAgentState::xhrBreakpoints, xhrBreakpoints);
+    if (url.isEmpty())
+        m_hasXHRBreakpointWithEmptyURL = false;
+    else
+        m_XHRBreakpoints.remove(url);
 }
 
 void InspectorBrowserDebuggerAgent::willSendXMLHttpRequest(const String& url)
@@ -391,13 +391,12 @@ void InspectorBrowserDebuggerAgent::willSendXMLHttpRequest(const String& url)
         return;
 
     String breakpointURL;
-    if (m_inspectorState->getBoolean(BrowserDebuggerAgentState::pauseOnAllXHRs))
+    if (m_hasXHRBreakpointWithEmptyURL)
         breakpointURL = "";
     else {
-        RefPtr<InspectorObject> xhrBreakpoints = m_inspectorState->getObject(BrowserDebuggerAgentState::xhrBreakpoints);
-        for (InspectorObject::iterator it = xhrBreakpoints->begin(); it != xhrBreakpoints->end(); ++it) {
-            if (url.contains(it->first)) {
-                breakpointURL = it->first;
+        for (HashSet<String>::iterator it = m_XHRBreakpoints.begin(); it != m_XHRBreakpoints.end(); ++it) {
+            if (url.contains(*it)) {
+                breakpointURL = *it;
                 break;
             }
         }
@@ -417,6 +416,8 @@ void InspectorBrowserDebuggerAgent::clear()
 {
     m_domBreakpoints.clear();
     m_eventListenerBreakpoints.clear();
+    m_XHRBreakpoints.clear();
+    m_hasXHRBreakpointWithEmptyURL = false;
 }
 
 } // namespace WebCore

third_party/WebKit/Source/WebCore/inspector/InspectorBrowserDebuggerAgent.h

@@ -109,6 +109,8 @@ private:
     InspectorAgent* m_inspectorAgent;
     HashMap<Node*, uint32_t> m_domBreakpoints;
     HashSet<String> m_eventListenerBreakpoints;
+    HashSet<String> m_XHRBreakpoints;
+    bool m_hasXHRBreakpointWithEmptyURL;
 };
 
 } // namespace WebCore

third_party/WebKit/Source/WebCore/inspector/front-end/BreakpointManager.js

@@ -52,6 +52,7 @@ WebInspector.BreakpointManager.BreakpointTypes = {
 WebInspector.BreakpointManager.Events = {
     DOMBreakpointAdded: "dom-breakpoint-added",
     EventListenerBreakpointAdded: "event-listener-breakpoint-added",
+    XHRBreakpointAdded: "xhr-breakpoint-added",
     ProjectChanged: "project-changed"
 }
 
@@ -98,14 +99,22 @@ WebInspector.BreakpointManager.prototype = {
         this.dispatchEventToListeners(WebInspector.BreakpointManager.Events.EventListenerBreakpointAdded, breakpoint.view);
     },
 
-    setXHRBreakpoint: function(url)
+    createXHRBreakpoint: function(url)
     {
-        BrowserDebuggerAgent.setXHRBreakpoint(url);
+        this._createXHRBreakpoint(url, true, false);
     },
 
-    removeXHRBreakpoint: function(url)
+    _createXHRBreakpoint: function(url, enabled, restored)
     {
-        BrowserDebuggerAgent.removeXHRBreakpoint(url);
+        var breakpointId = this._createXHRBreakpointId(url);
+        if (breakpointId in this._breakpoints)
+            return;
+
+        var breakpoint = new WebInspector.XHRBreakpoint(url);
+        this._setBreakpoint(breakpointId, breakpoint, enabled, restored);
+
+        breakpoint.view = new WebInspector.XHRBreakpointView(this, breakpointId, enabled, url);
+        this.dispatchEventToListeners(WebInspector.BreakpointManager.Events.XHRBreakpointAdded, breakpoint.view);
     },
 
     _setBreakpoint: function(breakpointId, breakpoint, enabled, restored)
@@ -148,6 +157,8 @@ WebInspector.BreakpointManager.prototype = {
             breakpointId = this._createDOMBreakpointId(eventData.nodeId, eventData.type);
         else if (eventData.breakpointType === WebInspector.BreakpointManager.BreakpointTypes.EventListener)
             breakpointId = this._createEventListenerBreakpointId(eventData.eventName);
+        else if (eventData.breakpointType === WebInspector.BreakpointManager.BreakpointTypes.XHR)
+            breakpointId = this._createXHRBreakpointId(eventData.breakpointURL);
         else
             return;
 
@@ -191,6 +202,8 @@ WebInspector.BreakpointManager.prototype = {
             var breakpoint = breakpoints[i];
             if (breakpoint.type === WebInspector.BreakpointManager.BreakpointTypes.EventListener)
                 this._createEventListenerBreakpoint(breakpoint.condition.eventName, breakpoint.enabled, true);
+            else if (breakpoint.type === WebInspector.BreakpointManager.BreakpointTypes.XHR)
+                this._createXHRBreakpoint(breakpoint.condition.url, breakpoint.enabled, true);
         }
 
         if (!this._breakpointsPushedToFrontend) {
@@ -279,9 +292,12 @@ WebInspector.BreakpointManager.prototype = {
                 if (typeof condition.eventName !== "string")
                     continue;
                 id += condition.eventName;
+            } else if (breakpoint.type === WebInspector.BreakpointManager.BreakpointTypes.XHR) {
+                if (typeof condition.url !== "string")
+                    continue;
+                id += condition.url;
             } else
                 continue;
-
             if (id in breakpointsSet)
                 continue;
             breakpointsSet[id] = true;
@@ -298,6 +314,11 @@ WebInspector.BreakpointManager.prototype = {
     _createEventListenerBreakpointId: function(eventName)
     {
         return "eventListner:" + eventName;
+    },
+
+    _createXHRBreakpointId: function(url)
+    {
+        return "xhr:" + url;
     }
 }
 
@@ -351,6 +372,30 @@ WebInspector.EventListenerBreakpoint.prototype = {
     }
 }
 
+WebInspector.XHRBreakpoint = function(url)
+{
+    this._url = url;
+}
+
+WebInspector.XHRBreakpoint.prototype = {
+    _enable: function()
+    {
+        BrowserDebuggerAgent.setXHRBreakpoint(this._url);
+    },
+
+    _disable: function()
+    {
+        BrowserDebuggerAgent.removeXHRBreakpoint(this._url);
+    },
+
+    _serializeToJSON: function()
+    {
+        var type = WebInspector.BreakpointManager.BreakpointTypes.XHR;
+        return { type: type, condition: { url: this._url } };
+    }
+}
+
+
 
 WebInspector.NativeBreakpointView = function(manager, id, enabled)
 {
@@ -533,6 +578,43 @@ WebInspector.EventListenerBreakpointView.prototype = {
 
 WebInspector.EventListenerBreakpointView.prototype.__proto__ = WebInspector.NativeBreakpointView.prototype;
 
+WebInspector.XHRBreakpointView = function(manager, id, enabled, url)
+{
+    WebInspector.NativeBreakpointView.call(this, manager, id, enabled);
+    this._url = url;
+}
+
+WebInspector.XHRBreakpointView.prototype = {
+    compareTo: function(other)
+    {
+        return this._compare(this._url, other._url);
+    },
+
+    populateEditElement: function(element)
+    {
+        element.textContent = this._url;
+    },
+
+    populateLabelElement: function(element)
+    {
+        var label;
+        if (!this._url.length)
+            label = WebInspector.UIString("Any XHR");
+        else
+            label = WebInspector.UIString("URL contains \"%s\"", this._url);
+        element.appendChild(document.createTextNode(label));
+        element.addStyleClass("cursor-auto");
+    },
+
+    populateStatusMessageElement: function(element)
+    {
+        var status = WebInspector.UIString("Paused on a XMLHttpRequest.");
+        element.appendChild(document.createTextNode(status));
+    }
+}
+
+WebInspector.XHRBreakpointView.prototype.__proto__ = WebInspector.NativeBreakpointView.prototype;
+
 WebInspector.DOMBreakpointTypes = {
     SubtreeModified: 0,
     AttributeModified: 1,

third_party/WebKit/Source/WebCore/inspector/front-end/BreakpointsSidebarPane.js

@@ -276,177 +276,61 @@ WebInspector.XHRBreakpointsSidebarPane = function()
 {
     WebInspector.NativeBreakpointsSidebarPane.call(this, WebInspector.UIString("XHR Breakpoints"));
 
-    this._breakpointElements = {};
+    function addButtonClicked(event)
+    {
+        event.stopPropagation();
+        this._startEditingBreakpoint(null);
+    }
 
     var addButton = document.createElement("button");
     addButton.className = "add";
-    addButton.addEventListener("click", this._addButtonClicked.bind(this), false);
+    addButton.addEventListener("click", addButtonClicked.bind(this), false);
     this.titleElement.appendChild(addButton);
-
-    this._restoreBreakpoints();
 }
 
 WebInspector.XHRBreakpointsSidebarPane.prototype = {
-    _addButtonClicked: function(event)
-    {
-        event.stopPropagation();
-
-        this.expanded = true;
-
-        var inputElement = document.createElement("span");
-        inputElement.className = "breakpoint-condition editing";
-        this._addListElement(inputElement, this.listElement.firstChild);
-
-        function finishEditing(accept, e, text)
-        {
-            this._removeListElement(inputElement);
-            if (accept) {
-                this._setBreakpoint(text, true);
-                this._saveBreakpoints();
-            }
-        }
-
-        WebInspector.startEditing(inputElement, {
-            commitHandler: finishEditing.bind(this, true),
-            cancelHandler: finishEditing.bind(this, false)
-        });
-    },
-
-    _setBreakpoint: function(url, enabled)
+    addBreakpointItem: function(breakpointItem)
     {
-        if (url in this._breakpointElements)
-            return;
-
-        var element = document.createElement("li");
-        element._url = url;
-        element.addEventListener("contextmenu", this._contextMenu.bind(this, url), true);
-
-        var checkboxElement = document.createElement("input");
-        checkboxElement.className = "checkbox-elem";
-        checkboxElement.type = "checkbox";
-        checkboxElement.checked = enabled;
-        checkboxElement.addEventListener("click", this._checkboxClicked.bind(this, url), false);
-        element._checkboxElement = checkboxElement;
-        element.appendChild(checkboxElement);
-
-        var labelElement = document.createElement("span");
-        if (!url)
-            labelElement.textContent = WebInspector.UIString("Any XHR");
-        else
-            labelElement.textContent = WebInspector.UIString("URL contains \"%s\"", url);
-        labelElement.addStyleClass("cursor-auto");
-        labelElement.addEventListener("dblclick", this._labelClicked.bind(this, url), false);
-        element.appendChild(labelElement);
-
-        var currentElement = this.listElement.firstChild;
-        while (currentElement) {
-            if (currentElement._url && currentElement._url < element._url)
-                break;
-            currentElement = currentElement.nextSibling;
-        }
-        this._addListElement(element, currentElement);
-        this._breakpointElements[url] = element;
-        if (enabled)
-            WebInspector.breakpointManager.setXHRBreakpoint(url);
+        WebInspector.NativeBreakpointsSidebarPane.prototype.addBreakpointItem.call(this, breakpointItem);
+        breakpointItem._labelElement.addEventListener("dblclick", this._startEditingBreakpoint.bind(this, breakpointItem), false);
     },
 
-    _removeBreakpoint: function(url)
+    _startEditingBreakpoint: function(breakpointItem)
     {
-        var element = this._breakpointElements[url];
-        if (!element)
+        if (this._editingBreakpoint)
             return;
+        this._editingBreakpoint = true;
 
-        this._removeListElement(element);
-        delete this._breakpointElements[url];
-        if (element._checkboxElement.checked)
-            WebInspector.breakpointManager.removeXHRBreakpoint(url);
-    },
-
-    _contextMenu: function(url, event)
-    {
-        var contextMenu = new WebInspector.ContextMenu();
-        function removeBreakpoint()
-        {
-            this._removeBreakpoint(url);
-            this._saveBreakpoints();
-        }
-        contextMenu.appendItem(WebInspector.UIString("Remove Breakpoint"), removeBreakpoint.bind(this));
-        contextMenu.show(event);
-    },
-
-    _checkboxClicked: function(url, event)
-    {
-        if (event.target.checked)
-            WebInspector.breakpointManager.setXHRBreakpoint(url);
-        else
-            WebInspector.breakpointManager.removeXHRBreakpoint(url);
-        this._saveBreakpoints();
-    },
+        if (!this.expanded)
+            this.expanded = true;
 
-    _labelClicked: function(url)
-    {
-        var element = this._breakpointElements[url];
         var inputElement = document.createElement("span");
         inputElement.className = "breakpoint-condition editing";
-        inputElement.textContent = url;
-        this.listElement.insertBefore(inputElement, element);
-        element.addStyleClass("hidden");
-
-        function finishEditing(accept, e, text)
-        {
-            this._removeListElement(inputElement);
-            if (accept) {
-                this._removeBreakpoint(url);
-                this._setBreakpoint(text, element._checkboxElement.checked);
-                this._saveBreakpoints();
+        if (breakpointItem) {
+            breakpointItem.populateEditElement(inputElement);
+            this.listElement.insertBefore(inputElement, breakpointItem.element);
+            breakpointItem.element.addStyleClass("hidden");
         } else
-                element.removeStyleClass("hidden");
-        }
+            this._addListElement(inputElement, this.listElement.firstChild);
 
+        var commitHandler = this._hideEditBreakpointDialog.bind(this, inputElement, true, breakpointItem);
+        var cancelHandler = this._hideEditBreakpointDialog.bind(this, inputElement, false, breakpointItem);
         WebInspector.startEditing(inputElement, {
-            commitHandler: finishEditing.bind(this, true),
-            cancelHandler: finishEditing.bind(this, false)
+            commitHandler: commitHandler,
+            cancelHandler: cancelHandler
         });
     },
 
-    highlightBreakpoint: function(url)
-    {
-        var element = this._breakpointElements[url];
-        if (!element)
-            return;
-        this.expanded = true;
-        element.addStyleClass("breakpoint-hit");
-        this._highlightedElement = element;
-    },
-
-    clearBreakpointHighlight: function()
-    {
-        if (this._highlightedElement) {
-            this._highlightedElement.removeStyleClass("breakpoint-hit");
-            delete this._highlightedElement;
-        }
-    },
-
-    _saveBreakpoints: function()
-    {
-        var breakpoints = [];
-        for (var url in this._breakpointElements)
-            breakpoints.push({ url: url, enabled: this._breakpointElements[url]._checkboxElement.checked });
-        WebInspector.settings.xhrBreakpoints = breakpoints;
-    },
-
-    _restoreBreakpoints: function()
-    {
-        var breakpoints = WebInspector.settings.xhrBreakpoints;
-        for (var i = 0; i < breakpoints.length; ++i) {
-            var breakpoint = breakpoints[i];
-            if (breakpoint && typeof breakpoint.url === "string")
-                this._setBreakpoint(breakpoint.url, breakpoint.enabled);
-        }
-    },
-
-    _projectChanged: function()
+    _hideEditBreakpointDialog: function(inputElement, accept, breakpointItem)
     {
+        this._removeListElement(inputElement);
+        this._editingBreakpoint = false;
+        if (accept) {
+            if (breakpointItem)
+                breakpointItem.remove();
+            WebInspector.breakpointManager.createXHRBreakpoint(inputElement.textContent.toLowerCase());
+        } else if (breakpointItem)
+            breakpointItem.element.removeStyleClass("hidden");
     }
 }
 

third_party/WebKit/Source/WebCore/inspector/front-end/CallStackSidebarPane.js

@@ -87,12 +87,8 @@ WebInspector.CallStackSidebarPane.prototype = {
 
         if (details.breakpoint)
             this._scriptBreakpointHit();
-        else if (details.eventType === WebInspector.DebuggerEventTypes.NativeBreakpoint) {
-            if (details.eventData.breakpointType === WebInspector.BreakpointManager.BreakpointTypes.XHR)
-                this._xhrBreakpointHit();
-            else
+        else if (details.eventType === WebInspector.DebuggerEventTypes.NativeBreakpoint)
             this._nativeBreakpointHit(details.eventData);
-        }
     },
 
     set selectedCallFrame(x)
@@ -190,14 +186,6 @@ WebInspector.CallStackSidebarPane.prototype = {
         this.bodyElement.appendChild(statusMessageElement);
     },
 
-    _xhrBreakpointHit: function()
-    {
-        var statusMessageElement = document.createElement("div");
-        statusMessageElement.className = "info";
-        statusMessageElement.textContent = WebInspector.UIString("Paused on a XMLHttpRequest.");
-        this.bodyElement.appendChild(statusMessageElement);
-    },
-
     _nativeBreakpointHit: function(eventData)
     {
         var breakpoint = WebInspector.breakpointManager.breakpointViewForEventData(eventData);

third_party/WebKit/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -145,7 +145,7 @@ WebInspector.ScriptsPanel = function()
     this.sidebarPanes.jsBreakpoints = new WebInspector.JavaScriptBreakpointsSidebarPane(this._presentationModel);
     if (Preferences.nativeInstrumentationEnabled) {
         this.sidebarPanes.domBreakpoints = WebInspector.createDOMBreakpointsSidebarPane();
-        this.sidebarPanes.xhrBreakpoints = new WebInspector.XHRBreakpointsSidebarPane();
+        this.sidebarPanes.xhrBreakpoints = WebInspector.createXHRBreakpointsSidebarPane();
         this.sidebarPanes.eventListenerBreakpoints = new WebInspector.EventListenerBreakpointsSidebarPane();
     }
 
@@ -421,8 +421,7 @@ WebInspector.ScriptsPanel.prototype = {
 
     _debuggerPaused: function(event)
     {
-        var details = event.data;
-        var callFrames = details.callFrames;
+        var callFrames = event.data.callFrames;
 
         this._paused = true;
         this._waitingToPause = false;
@@ -435,13 +434,8 @@ WebInspector.ScriptsPanel.prototype = {
         this.sidebarPanes.callstack.update(event.data);
         this.sidebarPanes.callstack.selectedCallFrame = callFrames[0];
 
-        if (details.eventType === WebInspector.DebuggerEventTypes.NativeBreakpoint) {
-            if (details.eventData.breakpointType === WebInspector.BreakpointManager.BreakpointTypes.XHR)
-                this.sidebarPanes.xhrBreakpoints.highlightBreakpoint(details.eventData.breakpointURL);
-        } else {
         var sourceLocation = this._presentationModel.selectedCallFrame.sourceLocation;
         this.sidebarPanes.jsBreakpoints.highlightBreakpoint(sourceLocation.sourceFileId, sourceLocation.lineNumber);
-        }
 
         window.focus();
         InspectorFrontendHost.bringToFront();
@@ -803,7 +797,6 @@ WebInspector.ScriptsPanel.prototype = {
         this.sidebarPanes.callstack.update(null);
         this.sidebarPanes.scopechain.update(null);
         this.sidebarPanes.jsBreakpoints.clearBreakpointHighlight();
-        this.sidebarPanes.xhrBreakpoints.clearBreakpointHighlight();
 
         this._clearCurrentExecutionLine();
         this._updateDebuggerButtons();

third_party/WebKit/Source/WebCore/inspector/front-end/Settings.js

@@ -72,7 +72,6 @@ WebInspector.Settings = function()
     this.installApplicationSetting("showUserAgentStyles", true);
     this.installApplicationSetting("watchExpressions", []);
     this.installApplicationSetting("breakpoints", []);
-    this.installApplicationSetting("xhrBreakpoints", []);
 
     this.installProjectSetting("nativeBreakpoints", []);
 }

third_party/WebKit/Source/WebCore/inspector/front-end/inspector.js

@@ -182,6 +182,17 @@ var WebInspector = {
         return pane;
     },
 
+    createXHRBreakpointsSidebarPane: function()
+    {
+        var pane = new WebInspector.XHRBreakpointsSidebarPane();
+        function breakpointAdded(event)
+        {
+            pane.addBreakpointItem(new WebInspector.BreakpointItem(event.data));
+        }
+        WebInspector.breakpointManager.addEventListener(WebInspector.BreakpointManager.Events.XHRBreakpointAdded, breakpointAdded);
+        return pane;
+    },
+
     _createPanels: function()
     {
         var hiddenPanels = (InspectorFrontendHost.hiddenPanels() || "").split(',');