<!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>[172204] trunk/Source/WebInspectorUI</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/172204">172204</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-08-06 23:23:14 -0700 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: breakpoint resolved state should not depend on all breakpoints being enabled
https://bugs.webkit.org/show_bug.cgi?id=135517
Reviewed by Joseph Pecoraro.
Previously, Breakpoint.resolved returned false if all breakpoints were disabled, even if
the breakpoint had an associated SourceCode. This was a weird hack to make it easier to
style breakpoint widgets. This made it hard for other code to deal with resolved
breakpoints that were also disabled, or SourceCodeLocations that resolve and unresolve.
This patch removes that consideration and fixes style update code to manually check if all
breakpoints are being suppressed.
The code now enforces that a Breakpoint must have a SourceCode before it can be resolved.
(As a performance optimization when loading the initial frame tree, we sometimes we give
Breakpoints a SourceCode before the debugger officially says that the breakpoint has been
resolved. Thus, it's possible to be unresolved with a SourceCode, but not vice-versa.)
This patch also adds a few guards where we assumed a SourceCodeLocation had a SourceCode.
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype.set breakpointsEnabled): Remove spurious
ResolvedStateDidChange events.
(WebInspector.DebuggerManager.prototype.breakpointResolved): Set the breakpoint's SourceCode
if it has not been set already by DebuggerManager.associateBreakpointsWithSourceCode.
* UserInterface/Models/Breakpoint.js:
(WebInspector.Breakpoint.prototype.get resolved):
(WebInspector.Breakpoint.prototype.set resolved.isSpecialBreakpoint):
(WebInspector.Breakpoint.prototype.set resolved): Add an assertion.
* UserInterface/Models/SourceCodeLocation.js: Add guards for !SourceCode.
(WebInspector.SourceCodeLocation.prototype.populateLiveDisplayLocationTooltip):
* UserInterface/Views/BreakpointTreeElement.js: Account for DebuggerManager.breakpointsEnabled.
(WebInspector.BreakpointTreeElement):
(WebInspector.BreakpointTreeElement.prototype._updateStatus):
* UserInterface/Views/ProbeSetDetailsSection.js:
(WebInspector.ProbeSetDetailsSection.prototype._updateLinkElement): Loosen the assertion.
* UserInterface/Views/SourceCodeTextEditor.js: Account for DebuggerManager.breakpointsEnabled.
(WebInspector.SourceCodeTextEditor):
(WebInspector.SourceCodeTextEditor.prototype.close):
(WebInspector.SourceCodeTextEditor.prototype._breakpointStatusDidChange):
(WebInspector.SourceCodeTextEditor.prototype._breakpointsEnabledDidChange):
(WebInspector.SourceCodeTextEditor.prototype._updateBreakpointStatus):
* UserInterface/Views/TextEditor.js: Account for DebuggerManager.breakpointsEnabled.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsBreakpointjs">trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs">trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDetailsSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2014-08-06 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><ins>+ Web Inspector: breakpoint resolved state should not depend on all breakpoints being enabled
+ https://bugs.webkit.org/show_bug.cgi?id=135517
+
+ Reviewed by Joseph Pecoraro.
+
+ Previously, Breakpoint.resolved returned false if all breakpoints were disabled, even if
+ the breakpoint had an associated SourceCode. This was a weird hack to make it easier to
+ style breakpoint widgets. This made it hard for other code to deal with resolved
+ breakpoints that were also disabled, or SourceCodeLocations that resolve and unresolve.
+ This patch removes that consideration and fixes style update code to manually check if all
+ breakpoints are being suppressed.
+
+ The code now enforces that a Breakpoint must have a SourceCode before it can be resolved.
+ (As a performance optimization when loading the initial frame tree, we sometimes we give
+ Breakpoints a SourceCode before the debugger officially says that the breakpoint has been
+ resolved. Thus, it's possible to be unresolved with a SourceCode, but not vice-versa.)
+
+ This patch also adds a few guards where we assumed a SourceCodeLocation had a SourceCode.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype.set breakpointsEnabled): Remove spurious
+ ResolvedStateDidChange events.
+
+ (WebInspector.DebuggerManager.prototype.breakpointResolved): Set the breakpoint's SourceCode
+ if it has not been set already by DebuggerManager.associateBreakpointsWithSourceCode.
+
+ * UserInterface/Models/Breakpoint.js:
+ (WebInspector.Breakpoint.prototype.get resolved):
+ (WebInspector.Breakpoint.prototype.set resolved.isSpecialBreakpoint):
+ (WebInspector.Breakpoint.prototype.set resolved): Add an assertion.
+ * UserInterface/Models/SourceCodeLocation.js: Add guards for !SourceCode.
+ (WebInspector.SourceCodeLocation.prototype.populateLiveDisplayLocationTooltip):
+ * UserInterface/Views/BreakpointTreeElement.js: Account for DebuggerManager.breakpointsEnabled.
+ (WebInspector.BreakpointTreeElement):
+ (WebInspector.BreakpointTreeElement.prototype._updateStatus):
+ * UserInterface/Views/ProbeSetDetailsSection.js:
+ (WebInspector.ProbeSetDetailsSection.prototype._updateLinkElement): Loosen the assertion.
+ * UserInterface/Views/SourceCodeTextEditor.js: Account for DebuggerManager.breakpointsEnabled.
+ (WebInspector.SourceCodeTextEditor):
+ (WebInspector.SourceCodeTextEditor.prototype.close):
+ (WebInspector.SourceCodeTextEditor.prototype._breakpointStatusDidChange):
+ (WebInspector.SourceCodeTextEditor.prototype._breakpointsEnabledDidChange):
+ (WebInspector.SourceCodeTextEditor.prototype._updateBreakpointStatus):
+ * UserInterface/Views/TextEditor.js: Account for DebuggerManager.breakpointsEnabled.
+
+2014-08-06 Brian J. Burg <burg@cs.washington.edu>
+
</ins><span class="cx"> Web Inspector: ReplayManager should unpause and suppress breakpoints before capturing/replaying
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135608
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -108,12 +108,6 @@
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange);
</span><span class="cx">
</span><del>- this._allExceptionsBreakpoint.dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
- this._allUncaughtExceptionsBreakpoint.dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
-
- for (var i = 0; i < this._breakpoints.length; ++i)
- this._breakpoints[i].dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
-
</del><span class="cx"> DebuggerAgent.setBreakpointsActive(enabled);
</span><span class="cx">
</span><span class="cx"> this._updateBreakOnExceptionsState();
</span><span class="lines">@@ -311,6 +305,11 @@
</span><span class="cx">
</span><span class="cx"> console.assert(breakpoint.identifier === breakpointIdentifier);
</span><span class="cx">
</span><ins>+ if (!breakpoint.sourceCodeLocation.sourceCode) {
+ var sourceCodeLocation = this._sourceCodeLocationFromPayload(location);
+ breakpoint.sourceCodeLocation.sourceCode = sourceCodeLocation.sourceCode;
+ }
+
</ins><span class="cx"> breakpoint.resolved = true;
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsBreakpointjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Breakpoint.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> get resolved()
</span><span class="cx"> {
</span><del>- return this._resolved && WebInspector.debuggerManager.breakpointsEnabled;
</del><ins>+ return this._resolved;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> set resolved(resolved)
</span><span class="lines">@@ -125,6 +125,13 @@
</span><span class="cx"> if (this._resolved === resolved)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ function isSpecialBreakpoint()
+ {
+ return this._sourceCodeLocation.isEqual(new WebInspector.SourceCodeLocation(null, Infinity, Infinity));
+ }
+
+ console.assert(!resolved || this._sourceCodeLocation.sourceCode || isSpecialBreakpoint.call(this), "Breakpoints must have a SourceCode to be resolved.", this);
+
</ins><span class="cx"> this._resolved = resolved || false;
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ResolvedStateDidChange);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsSourceCodeLocationjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/SourceCodeLocation.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -226,7 +226,8 @@
</span><span class="cx"> element.title = prefix + this.tooltipString();
</span><span class="cx">
</span><span class="cx"> this.addEventListener(WebInspector.SourceCodeLocation.Event.DisplayLocationChanged, function(event) {
</span><del>- element.title = prefix + this.tooltipString();
</del><ins>+ if (this.sourceCode)
+ element.title = prefix + this.tooltipString();
</ins><span class="cx"> }, this);
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -258,7 +259,8 @@
</span><span class="cx"> updateDisplayString.call(this, false);
</span><span class="cx">
</span><span class="cx"> this.addEventListener(WebInspector.SourceCodeLocation.Event.DisplayLocationChanged, function(event) {
</span><del>- updateDisplayString.call(this, currentDisplay, true);
</del><ins>+ if (this.sourceCode)
+ updateDisplayString.call(this, currentDisplay, true);
</ins><span class="cx"> }, this);
</span><span class="cx">
</span><span class="cx"> var boundMouseOverOrMove = mouseOverOrMove.bind(this);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.DisabledStateDidChange, this._updateStatus);
</span><span class="cx"> this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.AutoContinueDidChange, this._updateStatus);
</span><span class="cx"> this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateStatus);
</span><ins>+ this._listeners.register(WebInspector.debuggerManager, WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange, this._updateStatus);
</ins><span class="cx">
</span><span class="cx"> this._listeners.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded);
</span><span class="cx"> this._listeners.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved);
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx"> else
</span><span class="cx"> this._statusImageElement.classList.remove(WebInspector.BreakpointTreeElement.StatusImageAutoContinueStyleClassName);
</span><span class="cx">
</span><del>- if (this._breakpoint.resolved)
</del><ins>+ if (this._breakpoint.resolved && WebInspector.debuggerManager.breakpointsEnabled)
</ins><span class="cx"> this._statusImageElement.classList.add(WebInspector.BreakpointTreeElement.StatusImageResolvedStyleClassName);
</span><span class="cx"> else
</span><span class="cx"> this._statusImageElement.classList.remove(WebInspector.BreakpointTreeElement.StatusImageResolvedStyleClassName);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDetailsSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -91,11 +91,11 @@
</span><span class="cx"> {
</span><span class="cx"> var breakpoint = this._probeSet.breakpoint;
</span><span class="cx"> var titleElement = null;
</span><del>- if (breakpoint.resolved)
</del><ins>+ if (breakpoint.sourceCodeLocation.sourceCode)
</ins><span class="cx"> titleElement = WebInspector.createSourceCodeLocationLink(breakpoint.sourceCodeLocation);
</span><span class="cx"> else {
</span><span class="cx"> // Fallback for when we can't create a live source link.
</span><del>- console.assert(!breakpoint.sourceCodeLocation.sourceCode);
</del><ins>+ console.assert(!breakpoint.resolved);
</ins><span class="cx">
</span><span class="cx"> var location = breakpoint.sourceCodeLocation;
</span><span class="cx"> titleElement = WebInspector.linkifyLocation(breakpoint.url, location.displayLineNumber, location.displayColumnNumber);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -42,11 +42,12 @@
</span><span class="cx"> this.element.classList.add(WebInspector.SourceCodeTextEditor.StyleClassName);
</span><span class="cx">
</span><span class="cx"> if (this._supportsDebugging) {
</span><del>- WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.DisabledStateDidChange, this._updateBreakpointStatus, this);
- WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.AutoContinueDidChange, this._updateBreakpointStatus, this);
- WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateBreakpointStatus, this);
</del><ins>+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.DisabledStateDidChange, this._breakpointStatusDidChange, this);
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.AutoContinueDidChange, this._breakpointStatusDidChange, this);
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointStatusDidChange, this);
</ins><span class="cx"> WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.LocationDidChange, this._updateBreakpointLocation, this);
</span><span class="cx">
</span><ins>+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange, this._breakpointsEnabledDidChange, this);
</ins><span class="cx"> WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointAdded, this._breakpointAdded, this);
</span><span class="cx"> WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointRemoved, this._breakpointRemoved, this);
</span><span class="cx"> WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange, this._activeCallFrameDidChange, this);
</span><span class="lines">@@ -114,11 +115,12 @@
</span><span class="cx"> close: function()
</span><span class="cx"> {
</span><span class="cx"> if (this._supportsDebugging) {
</span><del>- WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.DisabledStateDidChange, this._updateBreakpointStatus, this);
- WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.AutoContinueDidChange, this._updateBreakpointStatus, this);
- WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateBreakpointStatus, this);
</del><ins>+ WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.DisabledStateDidChange, this._breakpointStatusDidChange, this);
+ WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.AutoContinueDidChange, this._breakpointStatusDidChange, this);
+ WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointStatusDidChange, this);
</ins><span class="cx"> WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.LocationDidChange, this._updateBreakpointLocation, this);
</span><span class="cx">
</span><ins>+ WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange, this._breakpointsEnabledDidChange, this);
</ins><span class="cx"> WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.BreakpointAdded, this._breakpointAdded, this);
</span><span class="cx"> WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.BreakpointRemoved, this._breakpointRemoved, this);
</span><span class="cx"> WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange, this._activeCallFrameDidChange, this);
</span><span class="lines">@@ -374,14 +376,27 @@
</span><span class="cx"> this._populateWithContent(content);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- _updateBreakpointStatus: function(event)
</del><ins>+ _breakpointStatusDidChange: function(event)
</ins><span class="cx"> {
</span><ins>+ this._updateBreakpointStatus(event.target);
+ },
+
+ _breakpointsEnabledDidChange: function()
+ {
</ins><span class="cx"> console.assert(this._supportsDebugging);
</span><span class="cx">
</span><ins>+ var breakpoints = WebInspector.debuggerManager.breakpointsForSourceCode(this._sourceCode);
+ for (var breakpoint of breakpoints)
+ this._updateBreakpointStatus(breakpoint);
+ },
+
+ _updateBreakpointStatus: function(breakpoint)
+ {
+ console.assert(this._supportsDebugging);
+
</ins><span class="cx"> if (!this._contentPopulated)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- var breakpoint = event.target;
</del><span class="cx"> if (!this._matchesBreakpoint(breakpoint))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js (172203 => 172204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2014-08-07 06:14:54 UTC (rev 172203)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TextEditor.js 2014-08-07 06:23:14 UTC (rev 172204)
</span><span class="lines">@@ -932,6 +932,8 @@
</span><span class="cx"> allAutoContinue = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ allResolved = allResolved && WebInspector.debuggerManager.breakpointsEnabled;
+
</ins><span class="cx"> function updateStyles()
</span><span class="cx"> {
</span><span class="cx"> // We might not have a line if the content isn't fully populated yet.
</span></span></pre>
</div>
</div>
</body>
</html>