Title: [215427] trunk/Source/WebInspectorUI
- Revision
- 215427
- Author
- mattba...@apple.com
- Date
- 2017-04-17 13:37:47 -0700 (Mon, 17 Apr 2017)
Log Message
Web Inspector: Show pause reason for "All Requests" XHR breakpoint
https://bugs.webkit.org/show_bug.cgi?id=170895
Reviewed by Joseph Pecoraro.
* Localizations/en.lproj/localizedStrings.js:
Add generic pause reason text: "Requesting: <url>".
* UserInterface/Controllers/DOMDebuggerManager.js:
(WebInspector.DOMDebuggerManager.prototype.xhrBreakpointForURL):
Relocated helper method from the sidebar.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype._updatePauseReasonSection):
Add an XHR breakpoint tree element when pause data contains a breakpoint
URL, otherwise just add a generic text row.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (215426 => 215427)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-04-17 20:25:56 UTC (rev 215426)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-04-17 20:37:47 UTC (rev 215427)
@@ -1,5 +1,24 @@
2017-04-17 Matt Baker <mattba...@apple.com>
+ Web Inspector: Show pause reason for "All Requests" XHR breakpoint
+ https://bugs.webkit.org/show_bug.cgi?id=170895
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Add generic pause reason text: "Requesting: <url>".
+
+ * UserInterface/Controllers/DOMDebuggerManager.js:
+ (WebInspector.DOMDebuggerManager.prototype.xhrBreakpointForURL):
+ Relocated helper method from the sidebar.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._updatePauseReasonSection):
+ Add an XHR breakpoint tree element when pause data contains a breakpoint
+ URL, otherwise just add a generic text row.
+
+2017-04-17 Matt Baker <mattba...@apple.com>
+
Web Inspector: XHR breakpoints restored from settings do not appear in the sidebar
https://bugs.webkit.org/show_bug.cgi?id=170890
Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (215426 => 215427)
--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-04-17 20:25:56 UTC (rev 215426)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-04-17 20:37:47 UTC (rev 215427)
@@ -671,6 +671,7 @@
localizedStrings["Request & Response"] = "Request & Response";
localizedStrings["Request Data"] = "Request Data";
localizedStrings["Request Headers"] = "Request Headers";
+localizedStrings["Requesting: %s"] = "Requesting: %s";
localizedStrings["Required"] = "Required";
localizedStrings["Reset"] = "Reset";
localizedStrings["Resource"] = "Resource";
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js (215426 => 215427)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js 2017-04-17 20:25:56 UTC (rev 215426)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js 2017-04-17 20:37:47 UTC (rev 215427)
@@ -172,6 +172,11 @@
this._saveDOMBreakpoints();
}
+ xhrBreakpointForURL(url)
+ {
+ return this._xhrBreakpoints.find((breakpoint) => breakpoint.url ="" url) || null;
+ }
+
addXHRBreakpoint(breakpoint)
{
console.assert(breakpoint instanceof WebInspector.XHRBreakpoint);
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (215426 => 215427)
--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-04-17 20:25:56 UTC (rev 215426)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-04-17 20:37:47 UTC (rev 215427)
@@ -1035,29 +1035,26 @@
case WebInspector.DebuggerManager.PauseReason.XHR:
console.assert(WebInspector.domDebuggerManager.supported);
console.assert(pauseData, "Expected XHR breakpoint data, but found none.");
- if (pauseData && pauseData.breakpointURL) {
- let xhrBreakpoints = WebInspector.domDebuggerManager.xhrBreakpoints;
- let xhrBreakpoint;
- for (let breakpoint of xhrBreakpoints) {
- if (breakpoint.url ="" pauseData.breakpointURL) {
- xhrBreakpoint = breakpoint;
- break;
- }
- }
+ if (pauseData) {
+ if (pauseData.breakpointURL) {
+ let xhrBreakpoint = WebInspector.domDebuggerManager.xhrBreakpointForURL(pauseData.breakpointURL);
+ console.assert(xhrBreakpoint, "Expected XHR breakpoint for URL.", pauseData.breakpointURL);
- if (!xhrBreakpoint)
- return;
+ this._pauseReasonTreeOutline = this.createContentTreeOutline(true);
- this._pauseReasonTreeOutline = this.createContentTreeOutline(true, true);
+ let xhrBreakpointTreeElement = new WebInspector.XHRBreakpointTreeElement(xhrBreakpoint, WebInspector.DebuggerSidebarPanel.PausedBreakpointIconStyleClassName, WebInspector.UIString("Triggered XHR Breakpoint"));
+ let xhrBreakpointRow = new WebInspector.DetailsSectionRow;
+ this._pauseReasonTreeOutline.appendChild(xhrBreakpointTreeElement);
+ xhrBreakpointRow.element.appendChild(this._pauseReasonTreeOutline.element);
- let xhrBreakpointTreeElement = new WebInspector.XHRBreakpointTreeElement(xhrBreakpoint, WebInspector.DebuggerSidebarPanel.PausedBreakpointIconStyleClassName, WebInspector.UIString("Triggered XHR Breakpoint"));
- let xhrBreakpointRow = new WebInspector.DetailsSectionRow;
- this._pauseReasonTreeOutline.appendChild(xhrBreakpointTreeElement);
- xhrBreakpointRow.element.appendChild(this._pauseReasonTreeOutline.element);
-
- this._pauseReasonTextRow.text = pauseData.url;
- this._pauseReasonGroup.rows = [xhrBreakpointRow, this._pauseReasonTextRow];
-
+ this._pauseReasonTextRow.text = pauseData.url;
+ this._pauseReasonGroup.rows = [xhrBreakpointRow, this._pauseReasonTextRow];
+ } else {
+ console.assert(pauseData.breakpointURL === "", "Should be the All Requests breakpoint which has an empty URL");
+ this._pauseReasonTextRow.text = WebInspector.UIString("Requesting: %s").format(pauseData.url);
+ this._pauseReasonGroup.rows = [this._pauseReasonTextRow];
+ }
+ this._pauseReasonTextRow.element.title = pauseData.url;
return true;
}
break;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
