Changeset 195343 in webkit

Timestamp:

Jan 19, 2016 10:20:58 PM (8 years ago)

Author:

Nikita Vasilyev

Message:

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".

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Object.js (modified) (1 diff)
• UserInterface/Views/BreakpointTreeElement.js (modified) (3 diffs)
• UserInterface/Views/ProbeSetDataGrid.js (modified) (2 diffs)
• UserInterface/Views/ProbeSetDetailsSection.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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".
+
 2016-01-19  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Object.js

@@ -143 +143 @@
                 return;
 
-            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;
-            }
+            console.assert(object._listeners instanceof Map);
 
             let listenersTable = object._listeners.get(eventType);

trunk/Source/WebInspectorUI/UserInterface/Views/BreakpointTreeElement.js

@@ -38 +38 @@
         this._probeSet = null;
 
-        this._listeners = new WebInspector.EventListenerSet(this, "BreakpointTreeElement listeners");
+        this._listenerSet = new WebInspector.EventListenerSet(this, "BreakpointTreeElement listeners");
         if (!title)
-            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);
-
-        this._listeners.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded);
-        this._listeners.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved);
+            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);
+
+        this._listenerSet.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetAdded, this._probeSetAdded);
+        this._listenerSet.register(WebInspector.probeManager, WebInspector.ProbeManager.Event.ProbeSetRemoved, this._probeSetRemoved);
 
         this._statusImageElement = document.createElement("img");
         this._statusImageElement.className = WebInspector.BreakpointTreeElement.StatusImageElementStyleClassName;
-        this._listeners.register(this._statusImageElement, "mousedown", this._statusImageElementMouseDown);
-        this._listeners.register(this._statusImageElement, "click", this._statusImageElementClicked);
+        this._listenerSet.register(this._statusImageElement, "mousedown", this._statusImageElementMouseDown);
+        this._listenerSet.register(this._statusImageElement, "click", this._statusImageElementClicked);
 
         if (!title)
@@ -107 +107 @@
         super.onattach();
 
-        this._listeners.install();
+        this._listenerSet.install();
 
         for (var probeSet of WebInspector.probeManager.probeSets)
@@ -118 +118 @@
         super.ondetach();
 
-        this._listeners.uninstall();
+        this._listenerSet.uninstall();
 
         if (this._probeSet)

trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDataGrid.js

@@ -47 +47 @@
         this._nodesSinceLastNavigation = [];
 
-        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();
+        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();
 
         this._setupData();
@@ -64 +64 @@
             this._teardownProbe(probe);
 
-        this._listeners.uninstall(true);
+        this._listenerSet.uninstall(true);
     }
 

trunk/Source/WebInspectorUI/UserInterface/Views/ProbeSetDetailsSection.js

@@ -45 +45 @@
         this._optionsElement = optionsElement;
 
-        this._listeners = new WebInspector.EventListenerSet(this, "ProbeSetDetailsSection UI listeners");
+        this._listenerSet = new WebInspector.EventListenerSet(this, "ProbeSetDetailsSection UI listeners");
         this._probeSet = probeSet;
         this._dataGrid = dataGrid;
@@ -65 +65 @@
         this._navigationBar.addNavigationItem(this._removeProbeButtonItem);
 
-        this._listeners.register(this._probeSet, WebInspector.ProbeSet.Event.SampleAdded, this._probeSetSamplesChanged);
-        this._listeners.register(this._probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._probeSetSamplesChanged);
+        this._listenerSet.register(this._probeSet, WebInspector.ProbeSet.Event.SampleAdded, this._probeSetSamplesChanged);
+        this._listenerSet.register(this._probeSet, WebInspector.ProbeSet.Event.SamplesCleared, this._probeSetSamplesChanged);
 
         // Update the source link when the breakpoint's resolved state changes,
         // so that it can become a live location link when possible.
         this._updateLinkElement();
-        this._listeners.register(this._probeSet.breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateLinkElement);
+        this._listenerSet.register(this._probeSet.breakpoint, WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._updateLinkElement);
 
-        this._listeners.install();
+        this._listenerSet.install();
     }
 
@@ -80 +80 @@
     closed()
     {
-        this._listeners.uninstall(true);
+        this._listenerSet.uninstall(true);
         this.element.remove();
     }