<!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>[195442] 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/195442">195442</a></dd>
<dt>Author</dt> <dd>nvasilyev@apple.com</dd>
<dt>Date</dt> <dd>2016-01-21 21:54:31 -0800 (Thu, 21 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/195305">r195305</a>): 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseObjectjs">trunk/Source/WebInspectorUI/UserInterface/Base/Object.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorunittestsobjectexpectedtxt">trunk/LayoutTests/inspector/unit-tests/object-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsobjecthtml">trunk/LayoutTests/inspector/unit-tests/object.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195441 => 195442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-22 05:49:26 UTC (rev 195441)
+++ trunk/LayoutTests/ChangeLog 2016-01-22 05:54:31 UTC (rev 195442)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-01-21 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Catch parameter should accept BindingPattern
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsobjectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/object-expected.txt (0 => 195442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/object-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/object-expected.txt 2016-01-22 05:54:31 UTC (rev 195442)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+Testing WebInspector.Object.
+
+
+== Running test suite: Object
+-- Running test case: Events propagation
+Dispatch count: 1
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsobjecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/object.html (0 => 195442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/object.html (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/object.html 2016-01-22 05:54:31 UTC (rev 195442)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createSyncSuite("Object");
+
+ suite.addTestCase({
+ name: "Events propagation",
+ description: "WebInspector.Object shouldn't dispatch constructor-level events multiple times",
+ test: function() {
+ class Parent extends WebInspector.Object {}
+ class Child extends Parent {}
+
+ const eventName = "clicked";
+ let dispatchCount = 0;
+
+ Parent.addEventListener(eventName, () => dispatchCount++);
+
+ let child = new Child;
+ child.dispatchEventToListeners(eventName);
+
+ InspectorTest.log("Dispatch count: " + dispatchCount);
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing WebInspector.Object.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (195441 => 195442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-22 05:49:26 UTC (rev 195441)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-22 05:54:31 UTC (rev 195442)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-01-21 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Add toggle-able list of classes for each element
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseObjectjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Object.js (195441 => 195442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2016-01-22 05:49:26 UTC (rev 195441)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Object.js 2016-01-22 05:54:31 UTC (rev 195442)
</span><span class="lines">@@ -139,12 +139,16 @@
</span><span class="cx">
</span><span class="cx"> function dispatch(object)
</span><span class="cx"> {
</span><del>- if (!object || !object._listeners || event._stoppedPropagation)
</del><ins>+ if (!object || event._stoppedPropagation)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- console.assert(object._listeners instanceof Map);
</del><ins>+ let listenerTypesMap = object._listeners;
+ if (!listenerTypesMap || !object.hasOwnProperty("_listeners"))
+ return;
</ins><span class="cx">
</span><del>- let listenersTable = object._listeners.get(eventType);
</del><ins>+ console.assert(listenerTypesMap instanceof Map);
+
+ let listenersTable = listenerTypesMap.get(eventType);
</ins><span class="cx"> if (!listenersTable)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>