<!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>[195343] 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/195343">195343</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-01-19 22:20:58 -0800 (Tue, 19 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Subclasses of WebInspector.Object shouldn't overwrite this._listeners
https://bugs.webkit.org/show_bug.cgi?id=153268
<rdar://problem/24252766>
Reviewed by Timothy Hatcher.
* UserInterface/Base/Object.js:
(WebInspector.Object.prototype.dispatchEventToListeners):
Add a console.assert.
* UserInterface/Views/BreakpointTreeElement.js:
(WebInspector.BreakpointTreeElement):
(WebInspector.BreakpointTreeElement.prototype.onattach):
(WebInspector.BreakpointTreeElement.prototype.ondetach):
* UserInterface/Views/ProbeSetDataGrid.js:
(WebInspector.ProbeSetDataGrid):
(WebInspector.ProbeSetDataGrid.prototype.closed):
* UserInterface/Views/ProbeSetDetailsSection.js:
(WebInspector.ProbeSetDetailsSection):
(WebInspector.ProbeSetDetailsSection.prototype.closed):
Replace all instances of "this._listeners" with "this._listenerSet".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseObjectjs">trunk/Source/WebInspectorUI/UserInterface/Base/Object.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDetailsSectionjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (195342 => 195343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-20 06:20:03 UTC (rev 195342)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-20 06:20:58 UTC (rev 195343)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-19 Nikita Vasilyev <nvasilyev@apple.com>
+
+ Web Inspector: Subclasses of WebInspector.Object shouldn't overwrite this._listeners
+ https://bugs.webkit.org/show_bug.cgi?id=153268
+ <rdar://problem/24252766>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Object.js:
+ (WebInspector.Object.prototype.dispatchEventToListeners):
+ Add a console.assert.
+
+ * UserInterface/Views/BreakpointTreeElement.js:
+ (WebInspector.BreakpointTreeElement):
+ (WebInspector.BreakpointTreeElement.prototype.onattach):
+ (WebInspector.BreakpointTreeElement.prototype.ondetach):
+ * UserInterface/Views/ProbeSetDataGrid.js:
+ (WebInspector.ProbeSetDataGrid):
+ (WebInspector.ProbeSetDataGrid.prototype.closed):
+ * UserInterface/Views/ProbeSetDetailsSection.js:
+ (WebInspector.ProbeSetDetailsSection):
+ (WebInspector.ProbeSetDetailsSection.prototype.closed):
+ Replace all instances of "this._listeners" with "this._listenerSet".
+
</ins><span class="cx"> 2016-01-19 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add protocol version for iOS 9.3
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Object.js (195342 => 195343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2016-01-20 06:20:03 UTC (rev 195342)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2016-01-20 06:20:58 UTC (rev 195343)
</span><span class="lines">@@ -142,10 +142,7 @@
</span><span class="cx"> if (!object || !object._listeners || event._stoppedPropagation)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!(object._listeners instanceof Map)) {
- console.error("object._listeners should be a Map but it isn't.\n`object` is most likely a WebInspector.EventListenerSet.");
- return;
- }
</del><ins>+ console.assert(object._listeners instanceof Map);
</ins><span class="cx">
</span><span class="cx"> let listenersTable = object._listeners.get(eventType);
</span><span class="cx"> if (!listenersTable)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsBreakpointTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js (195342 => 195343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2016-01-20 06:20:03 UTC (rev 195342)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js 2016-01-20 06:20:58 UTC (rev 195343)
</span><span class="lines">@@ -37,21 +37,21 @@
</span><span class="cx"> this._breakpoint = breakpoint;
</span><span class="cx"> this._probeSet = null;
</span><span class="cx">
</span><del>- this._listeners = new WebInspector.EventListenerSet(this, "BreakpointTreeElement listeners");
</del><ins>+ this._listenerSet = new WebInspector.EventListenerSet(this, "BreakpointTreeElement listeners");
</ins><span class="cx"> if (!title)
</span><del>- this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.LocationDidChange, this._breakpointLocationDidChange);
- this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.DisabledStateDidChange, this._updateStatus);
- this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.AutoContinueDidChange, this._updateStatus);
- this._listeners.register(breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateStatus);
- this._listeners.register(WebInspector.debuggerManager, WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange, this._updateStatus);
</del><ins>+ this._listenerSet.register(breakpoint, WebInspector.Breakpoint.Event.LocationDidChange, this._breakpointLocationDidChange);
+ this._listenerSet.register(breakpoint, WebInspector.Breakpoint.Event.DisabledStateDidChange, this._updateStatus);
+ this._listenerSet.register(breakpoint, WebInspector.Breakpoint.Event.AutoContinueDidChange, this._updateStatus);
+ this._listenerSet.register(breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateStatus);
+ this._listenerSet.register(WebInspector.debuggerManager, WebInspector.DebuggerManager.Event.BreakpointsEnabledDidChange, this._updateStatus);
</ins><span class="cx">
</span><del>- this._listeners.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded);
- this._listeners.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved);
</del><ins>+ this._listenerSet.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded);
+ this._listenerSet.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved);
</ins><span class="cx">
</span><span class="cx"> this._statusImageElement = document.createElement("img");
</span><span class="cx"> this._statusImageElement.className = WebInspector.BreakpointTreeElement.StatusImageElementStyleClassName;
</span><del>- this._listeners.register(this._statusImageElement, "mousedown", this._statusImageElementMouseDown);
- this._listeners.register(this._statusImageElement, "click", this._statusImageElementClicked);
</del><ins>+ this._listenerSet.register(this._statusImageElement, "mousedown", this._statusImageElementMouseDown);
+ this._listenerSet.register(this._statusImageElement, "click", this._statusImageElementClicked);
</ins><span class="cx">
</span><span class="cx"> if (!title)
</span><span class="cx"> this._updateTitles();
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> {
</span><span class="cx"> super.onattach();
</span><span class="cx">
</span><del>- this._listeners.install();
</del><ins>+ this._listenerSet.install();
</ins><span class="cx">
</span><span class="cx"> for (var probeSet of WebInspector.probeManager.probeSets)
</span><span class="cx"> if (probeSet.breakpoint === this._breakpoint)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> {
</span><span class="cx"> super.ondetach();
</span><span class="cx">
</span><del>- this._listeners.uninstall();
</del><ins>+ this._listenerSet.uninstall();
</ins><span class="cx">
</span><span class="cx"> if (this._probeSet)
</span><span class="cx"> this._removeProbeSet(this._probeSet);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js (195342 => 195343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2016-01-20 06:20:03 UTC (rev 195342)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js 2016-01-20 06:20:58 UTC (rev 195343)
</span><span class="lines">@@ -46,12 +46,12 @@
</span><span class="cx"> this._lastUpdatedFrame = null;
</span><span class="cx"> this._nodesSinceLastNavigation = [];
</span><span class="cx">
</span><del>- this._listeners = new WebInspector.EventListenerSet(this, "ProbeSetDataGrid instance listeners");
- this._listeners.register(probeSet, WebInspector.ProbeSet.Event.ProbeAdded, this._setupProbe);
- this._listeners.register(probeSet, WebInspector.ProbeSet.Event.ProbeRemoved, this._teardownProbe);
- this._listeners.register(probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._setupData);
- this._listeners.register(WebInspector.Probe, WebInspector.Probe.Event.ExpressionChanged, this._probeExpressionChanged);
- this._listeners.install();
</del><ins>+ this._listenerSet = new WebInspector.EventListenerSet(this, "ProbeSetDataGrid instance listeners");
+ this._listenerSet.register(probeSet, WebInspector.ProbeSet.Event.ProbeAdded, this._setupProbe);
+ this._listenerSet.register(probeSet, WebInspector.ProbeSet.Event.ProbeRemoved, this._teardownProbe);
+ this._listenerSet.register(probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._setupData);
+ this._listenerSet.register(WebInspector.Probe, WebInspector.Probe.Event.ExpressionChanged, this._probeExpressionChanged);
+ this._listenerSet.install();
</ins><span class="cx">
</span><span class="cx"> this._setupData();
</span><span class="cx"> }
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> for (var probe of this.probeSet)
</span><span class="cx"> this._teardownProbe(probe);
</span><span class="cx">
</span><del>- this._listeners.uninstall(true);
</del><ins>+ this._listenerSet.uninstall(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProbeSetDetailsSectionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js (195342 => 195343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js 2016-01-20 06:20:03 UTC (rev 195342)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js 2016-01-20 06:20:58 UTC (rev 195343)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> this._optionsElement = optionsElement;
</span><span class="cx">
</span><del>- this._listeners = new WebInspector.EventListenerSet(this, "ProbeSetDetailsSection UI listeners");
</del><ins>+ this._listenerSet = new WebInspector.EventListenerSet(this, "ProbeSetDetailsSection UI listeners");
</ins><span class="cx"> this._probeSet = probeSet;
</span><span class="cx"> this._dataGrid = dataGrid;
</span><span class="cx">
</span><span class="lines">@@ -64,22 +64,22 @@
</span><span class="cx"> this._removeProbeButtonItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._removeProbeButtonClicked, this);
</span><span class="cx"> this._navigationBar.addNavigationItem(this._removeProbeButtonItem);
</span><span class="cx">
</span><del>- this._listeners.register(this._probeSet, WebInspector.ProbeSet.Event.SampleAdded, this._probeSetSamplesChanged);
- this._listeners.register(this._probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._probeSetSamplesChanged);
</del><ins>+ this._listenerSet.register(this._probeSet, WebInspector.ProbeSet.Event.SampleAdded, this._probeSetSamplesChanged);
+ this._listenerSet.register(this._probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._probeSetSamplesChanged);
</ins><span class="cx">
</span><span class="cx"> // Update the source link when the breakpoint's resolved state changes,
</span><span class="cx"> // so that it can become a live location link when possible.
</span><span class="cx"> this._updateLinkElement();
</span><del>- this._listeners.register(this._probeSet.breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateLinkElement);
</del><ins>+ this._listenerSet.register(this._probeSet.breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateLinkElement);
</ins><span class="cx">
</span><del>- this._listeners.install();
</del><ins>+ this._listenerSet.install();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="cx"> closed()
</span><span class="cx"> {
</span><del>- this._listeners.uninstall(true);
</del><ins>+ this._listenerSet.uninstall(true);
</ins><span class="cx"> this.element.remove();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>