Changeset 195442 in webkit

Timestamp:

Jan 21, 2016 9:54:31 PM (8 years ago)

Author:

Nikita Vasilyev

Message:

REGRESSION (r195305): Web Inspector: WebInspector.Object can dispatch constructor-level events multiple times
​https://bugs.webkit.org/show_bug.cgi?id=153269
<rdar://problem/24253106>

Reviewed by Timothy Hatcher.

Source/WebInspectorUI:

Bring back object.hasOwnProperty("_listeners") check.

• UserInterface/Base/Object.js:

(WebInspector.Object.prototype.dispatchEventToListeners.dispatch):
(WebInspector.Object.prototype.dispatchEventToListeners):
(WebInspector.Object):
Check !object._listeners before !object.hasOwnProperty("_listeners")
because !object._listeners is more common case thus we can exit earlier
most of the time.

LayoutTests:

• inspector/unit-tests/object-expected.txt: Added.
• inspector/unit-tests/object.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/unit-tests/object-expected.txt (added)
• LayoutTests/inspector/unit-tests/object.html (added)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Base/Object.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-21  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION (r195305): Web Inspector: WebInspector.Object can dispatch constructor-level events multiple times
+        https://bugs.webkit.org/show_bug.cgi?id=153269
+        <rdar://problem/24253106>
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/unit-tests/object-expected.txt: Added.
+        * inspector/unit-tests/object.html: Added.
+
 2016-01-21  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-01-21  Nikita Vasilyev  <nvasilyev@apple.com>
+
+        REGRESSION (r195305): Web Inspector: WebInspector.Object can dispatch constructor-level events multiple times
+        https://bugs.webkit.org/show_bug.cgi?id=153269
+        <rdar://problem/24253106>
+
+        Reviewed by Timothy Hatcher.
+
+        Bring back object.hasOwnProperty("_listeners") check.
+
+        * UserInterface/Base/Object.js:
+        (WebInspector.Object.prototype.dispatchEventToListeners.dispatch):
+        (WebInspector.Object.prototype.dispatchEventToListeners):
+        (WebInspector.Object):
+        Check !object._listeners before !object.hasOwnProperty("_listeners")
+        because !object._listeners is more common case thus we can exit earlier
+        most of the time.
+
 2016-01-21  Devin Rousso  <dcrousso+webkit@gmail.com>
 

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

@@ -140 +140 @@
         function dispatch(object)
         {
-            if (!object || !object._listeners || event._stoppedPropagation)
+            if (!object || event._stoppedPropagation)
                 return;
 
-            console.assert(object._listeners instanceof Map);
-
-            let listenersTable = object._listeners.get(eventType);
+            let listenerTypesMap = object._listeners;
+            if (!listenerTypesMap || !object.hasOwnProperty("_listeners"))
+                return;
+
+            console.assert(listenerTypesMap instanceof Map);
+
+            let listenersTable = listenerTypesMap.get(eventType);
             if (!listenersTable)
                 return;