<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214956] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214956">214956</a></dd>
<dt>Author</dt> <dd>mattbaker@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 11:57:35 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: XHR breakpoints should be global
https://bugs.webkit.org/show_bug.cgi?id=170033
Source/WebInspectorUI:
Reviewed by Joseph Pecoraro.
* Localizations/en.lproj/localizedStrings.js:
Shorten XHR breakpoint tree element "URL contains:" title to "URL".
* UserInterface/Controllers/DOMDebuggerManager.js:
Change storage of XHR breakpoints from a map to a simple array.
(WebInspector.DOMDebuggerManager):
(WebInspector.DOMDebuggerManager.prototype.get xhrBreakpoints):
(WebInspector.DOMDebuggerManager.prototype.addXHRBreakpoint):
Dispatch the "breakpoint added" event immediately after adding the
breakpoint, rather than waiting for it to resolve.
(WebInspector.DOMDebuggerManager.prototype.removeXHRBreakpoint):
(WebInspector.DOMDebuggerManager.prototype._speculativelyResolveBreakpoints):
(WebInspector.DOMDebuggerManager.prototype._resolveXHRBreakpoint):
(WebInspector.DOMDebuggerManager.prototype._saveXHRBreakpoints):
(WebInspector.DOMDebuggerManager.prototype._mainResourceDidChange):
* UserInterface/Models/XHRBreakpoint.js:
An XHR breakpoint should not be associated with a particular document.
(WebInspector.XHRBreakpoint):
(WebInspector.XHRBreakpoint.prototype.get serializableInfo):
(WebInspector.XHRBreakpoint.prototype.saveIdentityToCookie):
(WebInspector.XHRBreakpoint.prototype.get documentURL): Deleted.
* UserInterface/Views/DebuggerSidebarPanel.css:
Use default emdash-separated title/subtitle style instead of the
custom "URL contains:" labeling.
(.sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle):
(.sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle:before): Deleted.
(body[dir=ltr] .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle): Deleted.
(body[dir=rtl] .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle): Deleted.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype.willDismissPopover):
(WebInspector.DebuggerSidebarPanel):
* UserInterface/Views/XHRBreakpointTreeElement.js:
(WebInspector.XHRBreakpointTreeElement):
LayoutTests:
Reviewed by Joseph Pecoraro..
* inspector/dom-debugger/xhr-breakpoints.html:
Update for XHRBreakpoint constructor change.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsinspectordomdebuggerxhrbreakpointshtml">trunk/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDOMDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsXHRBreakpointjs">trunk/Source/WebInspectorUI/UserInterface/Models/XHRBreakpoint.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPanelcss">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsXHRBreakpointTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/XHRBreakpointTreeElement.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/LayoutTests/ChangeLog 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-04-05 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: XHR breakpoints should be global
+ https://bugs.webkit.org/show_bug.cgi?id=170033
+
+ Reviewed by Joseph Pecoraro..
+
+ * inspector/dom-debugger/xhr-breakpoints.html:
+ Update for XHRBreakpoint constructor change.
+
</ins><span class="cx"> 2017-04-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> <input type="range"> changing to disabled while active breaks all pointer events
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomdebuggerxhrbreakpointshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/LayoutTests/inspector/dom-debugger/xhr-breakpoints.html 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> if (!mainFrame)
</span><span class="cx"> reject();
</span><span class="cx">
</span><del>- let breakpoint = new WebInspector.XHRBreakpoint(mainFrame.url, url);
</del><ins>+ let breakpoint = new WebInspector.XHRBreakpoint(url);
</ins><span class="cx"> WebInspector.domDebuggerManager.awaitEvent(WebInspector.DOMDebuggerManager.Event.XHRBreakpointAdded)
</span><span class="cx"> .then(() => {
</span><span class="cx"> InspectorTest.expectFalse(breakpoint.disabled, "Breakpoint should not be disabled initially.");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2017-04-05 Matt Baker <mattbaker@apple.com>
+
+ Web Inspector: XHR breakpoints should be global
+ https://bugs.webkit.org/show_bug.cgi?id=170033
+
+ Reviewed by Joseph Pecoraro.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ Shorten XHR breakpoint tree element "URL contains:" title to "URL".
+
+ * UserInterface/Controllers/DOMDebuggerManager.js:
+ Change storage of XHR breakpoints from a map to a simple array.
+ (WebInspector.DOMDebuggerManager):
+ (WebInspector.DOMDebuggerManager.prototype.get xhrBreakpoints):
+ (WebInspector.DOMDebuggerManager.prototype.addXHRBreakpoint):
+ Dispatch the "breakpoint added" event immediately after adding the
+ breakpoint, rather than waiting for it to resolve.
+
+ (WebInspector.DOMDebuggerManager.prototype.removeXHRBreakpoint):
+ (WebInspector.DOMDebuggerManager.prototype._speculativelyResolveBreakpoints):
+ (WebInspector.DOMDebuggerManager.prototype._resolveXHRBreakpoint):
+ (WebInspector.DOMDebuggerManager.prototype._saveXHRBreakpoints):
+ (WebInspector.DOMDebuggerManager.prototype._mainResourceDidChange):
+
+ * UserInterface/Models/XHRBreakpoint.js:
+ An XHR breakpoint should not be associated with a particular document.
+ (WebInspector.XHRBreakpoint):
+ (WebInspector.XHRBreakpoint.prototype.get serializableInfo):
+ (WebInspector.XHRBreakpoint.prototype.saveIdentityToCookie):
+ (WebInspector.XHRBreakpoint.prototype.get documentURL): Deleted.
+
+ * UserInterface/Views/DebuggerSidebarPanel.css:
+ Use default emdash-separated title/subtitle style instead of the
+ custom "URL contains:" labeling.
+
+ (.sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle):
+ (.sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle:before): Deleted.
+ (body[dir=ltr] .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle): Deleted.
+ (body[dir=rtl] .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle): Deleted.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype.willDismissPopover):
+ (WebInspector.DebuggerSidebarPanel):
+
+ * UserInterface/Views/XHRBreakpointTreeElement.js:
+ (WebInspector.XHRBreakpointTreeElement):
+
</ins><span class="cx"> 2017-04-04 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: RTL: layout issues in Type Profiler popovers
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -864,7 +864,7 @@
</span><span class="cx"> localizedStrings["Type"] = "Type";
</span><span class="cx"> localizedStrings["Type Issue"] = "Type Issue";
</span><span class="cx"> localizedStrings["Type information for variable: %s"] = "Type information for variable: %s";
</span><del>-localizedStrings["URL contains:"] = "URL contains:";
</del><ins>+localizedStrings["URL"] = "URL";
</ins><span class="cx"> localizedStrings["Unable to determine path to property from root"] = "Unable to determine path to property from root";
</span><span class="cx"> localizedStrings["Uncaught Exceptions"] = "Uncaught Exceptions";
</span><span class="cx"> localizedStrings["Unchanged"] = "Unchanged";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDOMDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -34,11 +34,11 @@
</span><span class="cx"> this._domBreakpointFrameIdentifierMap = new Map;
</span><span class="cx">
</span><span class="cx"> this._xhrBreakpointsSetting = new WebInspector.Setting("xhr-breakpoints", []);
</span><del>- this._xhrBreakpointURLMap = new Map;
</del><ins>+ this._xhrBreakpoints = [];
</ins><span class="cx"> this._allRequestsBreakpointEnabledSetting = new WebInspector.Setting("break-on-all-requests", false);
</span><span class="cx">
</span><span class="cx"> const emptyURL = "";
</span><del>- this._allRequestsBreakpoint = new WebInspector.XHRBreakpoint(null, emptyURL, !this._allRequestsBreakpointEnabledSetting.value);
</del><ins>+ this._allRequestsBreakpoint = new WebInspector.XHRBreakpoint(emptyURL, !this._allRequestsBreakpointEnabledSetting.value);
</ins><span class="cx">
</span><span class="cx"> WebInspector.DOMBreakpoint.addEventListener(WebInspector.DOMBreakpoint.Event.DisabledStateDidChange, this._domBreakpointDisabledStateDidChange, this);
</span><span class="cx"> WebInspector.XHRBreakpoint.addEventListener(WebInspector.XHRBreakpoint.Event.DisabledStateDidChange, this._xhrBreakpointDisabledStateDidChange, this);
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (let cookie of this._xhrBreakpointsSetting.value) {
</span><del>- let breakpoint = new WebInspector.XHRBreakpoint(cookie.documentURL, cookie.url, cookie.disabled);
</del><ins>+ let breakpoint = new WebInspector.XHRBreakpoint(cookie.url, cookie.disabled);
</ins><span class="cx"> this.addXHRBreakpoint(breakpoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -100,19 +100,8 @@
</span><span class="cx"> return resolvedBreakpoints;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get xhrBreakpoints()
- {
- let mainFrame = WebInspector.frameResourceManager.mainFrame;
- if (!mainFrame)
- return [];
</del><ins>+ get xhrBreakpoints() { return this._xhrBreakpoints; }
</ins><span class="cx">
</span><del>- let breakpoints = this._xhrBreakpointURLMap.get(mainFrame.url)
- if (!breakpoints)
- return [];
-
- return breakpoints.slice();
- }
-
</del><span class="cx"> isBreakpointRemovable(breakpoint)
</span><span class="cx"> {
</span><span class="cx"> return breakpoint !== this._allRequestsBreakpoint;
</span><span class="lines">@@ -186,17 +175,20 @@
</span><span class="cx"> addXHRBreakpoint(breakpoint)
</span><span class="cx"> {
</span><span class="cx"> console.assert(breakpoint instanceof WebInspector.XHRBreakpoint);
</span><del>- if (!breakpoint || !breakpoint.documentURL)
</del><ins>+ if (!breakpoint)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- let url = breakpoint.documentURL;
- let breakpoints = this._xhrBreakpointURLMap.get(url);
- if (!breakpoints) {
- breakpoints = [breakpoint];
- this._xhrBreakpointURLMap.set(url, breakpoints);
- } else
- breakpoints.push(breakpoint);
</del><ins>+ console.assert(!this._xhrBreakpoints.includes(breakpoint), "Already added XHR breakpoint.", breakpoint);
+ if (this._xhrBreakpoints.includes(breakpoint))
+ return;
</ins><span class="cx">
</span><ins>+ if (this._xhrBreakpoints.some((entry) => entry.url === breakpoint.url))
+ return;
+
+ this._xhrBreakpoints.push(breakpoint);
+
+ this.dispatchEventToListeners(WebInspector.DOMDebuggerManager.Event.XHRBreakpointAdded, {breakpoint});
+
</ins><span class="cx"> this._resolveXHRBreakpoint(breakpoint);
</span><span class="cx"> this._saveXHRBreakpoints();
</span><span class="cx"> }
</span><span class="lines">@@ -207,17 +199,14 @@
</span><span class="cx"> if (!breakpoint)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- let url = breakpoint.documentURL;
- let breakpoints = this._xhrBreakpointURLMap.get(url);
- breakpoints.remove(breakpoint, true);
</del><ins>+ if (!this._xhrBreakpoints.includes(breakpoint))
+ return;
</ins><span class="cx">
</span><del>- this._detachXHRBreakpoint(breakpoint);
</del><ins>+ this._xhrBreakpoints.remove(breakpoint, true);
</ins><span class="cx">
</span><del>- if (!breakpoints.length)
- this._xhrBreakpointURLMap.delete(url);
-
</del><span class="cx"> this.dispatchEventToListeners(WebInspector.DOMDebuggerManager.Event.DOMBreakpointRemoved, {breakpoint});
</span><span class="cx">
</span><ins>+ this._detachXHRBreakpoint(breakpoint);
</ins><span class="cx"> this._saveXHRBreakpoints();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -288,11 +277,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let xhrBreakpoints = this._xhrBreakpointURLMap.get(mainFrame.url);
- if (xhrBreakpoints) {
- for (let breakpoint of xhrBreakpoints)
- this._resolveXHRBreakpoint(breakpoint);
- }
</del><ins>+ for (let breakpoint of this._xhrBreakpoints)
+ this._resolveXHRBreakpoint(breakpoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _resolveDOMBreakpoint(breakpoint, nodeIdentifier)
</span><span class="lines">@@ -374,7 +360,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this._updateXHRBreakpoint(breakpoint, () => {
</span><del>- this.dispatchEventToListeners(WebInspector.DOMDebuggerManager.Event.XHRBreakpointAdded, {breakpoint});
</del><ins>+ breakpoint.dispatchEventToListeners(WebInspector.XHRBreakpoint.Event.ResolvedStateDidChange);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -395,11 +381,7 @@
</span><span class="cx"> if (this._restoringBreakpoints)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- let breakpointsToSave = [];
- for (let breakpoints of this._xhrBreakpointURLMap.values())
- breakpointsToSave = breakpointsToSave.concat(breakpoints);
-
- this._xhrBreakpointsSetting.value = breakpointsToSave.map((breakpoint) => breakpoint.serializableInfo);
</del><ins>+ this._xhrBreakpointsSetting.value = this._xhrBreakpoints.map((breakpoint) => breakpoint.serializableInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _domBreakpointDisabledStateDidChange(event)
</span><span class="lines">@@ -440,11 +422,8 @@
</span><span class="cx">
</span><span class="cx"> this._domBreakpointFrameIdentifierMap.clear();
</span><span class="cx">
</span><del>- let xhrBreakpoints = this._xhrBreakpointURLMap.get(frame.url);
- if (xhrBreakpoints) {
- for (let breakpoint of xhrBreakpoints)
- this._detachXHRBreakpoint(breakpoint);
- }
</del><ins>+ for (let breakpoint of this._xhrBreakpoints)
+ this._detachXHRBreakpoint(breakpoint);
</ins><span class="cx"> } else
</span><span class="cx"> this._detachBreakpointsForFrame(frame);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsXHRBreakpointjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/XHRBreakpoint.js (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/XHRBreakpoint.js 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/XHRBreakpoint.js 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -25,11 +25,10 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.XHRBreakpoint = class XHRBreakpoint extends WebInspector.Object
</span><span class="cx"> {
</span><del>- constructor(documentURL, url, disabled)
</del><ins>+ constructor(url, disabled)
</ins><span class="cx"> {
</span><span class="cx"> super();
</span><span class="cx">
</span><del>- this._documentURL = documentURL;
</del><span class="cx"> this._url = url;
</span><span class="cx"> this._disabled = disabled || false;
</span><span class="cx"> }
</span><span class="lines">@@ -36,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><del>- get documentURL() { return this._documentURL; }
</del><span class="cx"> get url() { return this._url; }
</span><span class="cx">
</span><span class="cx"> get disabled()
</span><span class="lines">@@ -56,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> get serializableInfo()
</span><span class="cx"> {
</span><del>- let info = {documentURL: this._documentURL, url: this._url};
</del><ins>+ let info = {url: this._url};
</ins><span class="cx"> if (this._disabled)
</span><span class="cx"> info.disabled = true;
</span><span class="cx">
</span><span class="lines">@@ -65,12 +63,10 @@
</span><span class="cx">
</span><span class="cx"> saveIdentityToCookie(cookie)
</span><span class="cx"> {
</span><del>- cookie[WebInspector.XHRBreakpoint.DocumentURLCookieKey] = this._documentURL;
</del><span class="cx"> cookie[WebInspector.XHRBreakpoint.URLCookieKey] = this._url;
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.XHRBreakpoint.DocumentURLCookieKey = "xhr-breakpoint-document-url";
</del><span class="cx"> WebInspector.XHRBreakpoint.URLCookieKey = "xhr-breakpoint-url";
</span><span class="cx">
</span><span class="cx"> WebInspector.XHRBreakpoint.Event = {
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPanelcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.css 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -120,21 +120,6 @@
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle:before {
- content: "";
-}
-
</del><span class="cx"> .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle {
</span><del>- padding-left: 5px;
</del><span class="cx"> font-family: Menlo, monospace;
</span><del>-
- --subtitle-padding-start: 6px;
</del><span class="cx"> }
</span><del>-
-body[dir=ltr] .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle {
- padding-left: var(--subtitle-padding-start);
-}
-
-body[dir=rtl] .sidebar > .panel.navigation.debugger .details-section.xhr-breakpoints .item.breakpoint .subtitle {
- padding-right: var(--subtitle-padding-start);
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -1171,8 +1171,7 @@
</span><span class="cx"> if (!url)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- let documentURL = WebInspector.frameResourceManager.mainFrame.url;
- WebInspector.domDebuggerManager.addXHRBreakpoint(new WebInspector.XHRBreakpoint(documentURL, url));
</del><ins>+ WebInspector.domDebuggerManager.addXHRBreakpoint(new WebInspector.XHRBreakpoint(url));
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsXHRBreakpointTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/XHRBreakpointTreeElement.js (214955 => 214956)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/XHRBreakpointTreeElement.js 2017-04-05 18:47:39 UTC (rev 214955)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/XHRBreakpointTreeElement.js 2017-04-05 18:57:35 UTC (rev 214956)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx">
</span><span class="cx"> let subtitle;
</span><span class="cx"> if (!title) {
</span><del>- title = WebInspector.UIString("URL contains:");
- subtitle = breakpoint.url;
</del><ins>+ title = WebInspector.UIString("URL");
+ subtitle = doubleQuotedString(breakpoint.url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> super(["breakpoint", className], title, subtitle, breakpoint);
</span></span></pre>
</div>
</div>
</body>
</html>