<!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>[242511] 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/242511">242511</a></dd>
<dt>Author</dt> <dd>drousso@apple.com</dd>
<dt>Date</dt> <dd>2019-03-05 14:05:15 -0800 (Tue, 05 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Canvas: remove event listeners once a recording is ready
https://bugs.webkit.org/show_bug.cgi?id=195324

Reviewed by Matt Baker.

* UserInterface/Models/Recording.js:
(WI.Recording):
(WI.Recording.prototype.async swizzle):
(WI.Recording.prototype.async _process):

* UserInterface/Views/RecordingActionTreeElement.js:
(WI.RecordingActionTreeElement):
(WI.RecordingActionTreeElement.prototype._handleValidityChanged):

* UserInterface/Views/CanvasSidebarPanel.js:
(WI.CanvasSidebarPanel.prototype.set recording):
(WI.CanvasSidebarPanel.prototype._handleRecordingProcessedAction):

* UserInterface/Views/RecordingContentView.js:
(WI.RecordingContentView.prototype.initialLayout):
(WI.RecordingContentView.prototype._handleRecordingProcessedAction):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsRecordingjs">trunk/Source/WebInspectorUI/UserInterface/Models/Recording.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCanvasSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRecordingActionTreeElementjs">trunk/Source/WebInspectorUI/UserInterface/Views/RecordingActionTreeElement.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRecordingContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/RecordingContentView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (242510 => 242511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog    2019-03-05 22:00:57 UTC (rev 242510)
+++ trunk/Source/WebInspectorUI/ChangeLog       2019-03-05 22:05:15 UTC (rev 242511)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2019-03-05  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Canvas: remove event listeners once a recording is ready
+        https://bugs.webkit.org/show_bug.cgi?id=195324
+
+        Reviewed by Matt Baker.
+
+        * UserInterface/Models/Recording.js:
+        (WI.Recording):
+        (WI.Recording.prototype.async swizzle):
+        (WI.Recording.prototype.async _process):
+
+        * UserInterface/Views/RecordingActionTreeElement.js:
+        (WI.RecordingActionTreeElement):
+        (WI.RecordingActionTreeElement.prototype._handleValidityChanged):
+
+        * UserInterface/Views/CanvasSidebarPanel.js:
+        (WI.CanvasSidebarPanel.prototype.set recording):
+        (WI.CanvasSidebarPanel.prototype._handleRecordingProcessedAction):
+
+        * UserInterface/Views/RecordingContentView.js:
+        (WI.RecordingContentView.prototype.initialLayout):
+        (WI.RecordingContentView.prototype._handleRecordingProcessedAction):
+
</ins><span class="cx"> 2019-03-05  Joseph Pecoraro  <pecoraro@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Attempting to select records in the bottom 16px of the timeline overview graph fails
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsRecordingjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/Recording.js (242510 => 242511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/Recording.js    2019-03-05 22:00:57 UTC (rev 242510)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/Recording.js       2019-03-05 22:05:15 UTC (rev 242511)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">         this._data = data;
</span><span class="cx">         this._displayName = WI.UIString("Recording");
</span><span class="cx"> 
</span><del>-        this._swizzle = [];
</del><ins>+        this._swizzle = null;
</ins><span class="cx">         this._actions = [new WI.RecordingInitialStateAction].concat(...this._frames.map((frame) => frame.actions));
</span><span class="cx">         this._visualActionIndexes = [];
</span><span class="cx">         this._source = null;
</span><span class="lines">@@ -295,6 +295,9 @@
</span><span class="cx"> 
</span><span class="cx">     async swizzle(index, type)
</span><span class="cx">     {
</span><ins>+        if (!this._swizzle)
+            this._swizzle = {};
+
</ins><span class="cx">         if (typeof this._swizzle[index] !== "object")
</span><span class="cx">             this._swizzle[index] = {};
</span><span class="cx"> 
</span><span class="lines">@@ -530,6 +533,7 @@
</span><span class="cx">                 return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        this._swizzle = null;
</ins><span class="cx">         this._processContext = null;
</span><span class="cx">         this._processing = false;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCanvasSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js (242510 => 242511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js    2019-03-05 22:00:57 UTC (rev 242510)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js       2019-03-05 22:05:15 UTC (rev 242511)
</span><span class="lines">@@ -114,10 +114,8 @@
</span><span class="cx">         if (recording === this._recording)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        if (this._recording) {
-            this._recording.removeEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
-            this._recording.removeEventListener(WI.Recording.Event.StartProcessingFrame, this._handleRecordingStartProcessingFrame, this);
-        }
</del><ins>+        if (this._recording)
+            this._recording.removeEventListener(null, null, this);
</ins><span class="cx"> 
</span><span class="cx">         if (recording)
</span><span class="cx">             this.canvas = recording.source;
</span><span class="lines">@@ -124,7 +122,7 @@
</span><span class="cx"> 
</span><span class="cx">         this._recording = recording;
</span><span class="cx"> 
</span><del>-        if (this._recording) {
</del><ins>+        if (this._recording && !this._recording.ready) {
</ins><span class="cx">             this._recording.addEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
</span><span class="cx">             this._recording.addEventListener(WI.Recording.Event.StartProcessingFrame, this._handleRecordingStartProcessingFrame, this);
</span><span class="cx">         }
</span><span class="lines">@@ -579,12 +577,16 @@
</span><span class="cx">         console.assert(isInitialStateAction || this._recordingTreeOutline.children.lastValue instanceof WI.FolderTreeElement, "There should be a WI.FolderTreeElement for the frame for this action.");
</span><span class="cx">         this._createRecordingActionTreeElement(action, index, isInitialStateAction ? this._recordingTreeOutline : this._recordingTreeOutline.children.lastValue);
</span><span class="cx"> 
</span><del>-        if (this._recording.ready && !this._recording[WI.CanvasSidebarPanel.SelectedActionSymbol])
-            this.action = this._recording.actions[0];
</del><ins>+        if (this._recording.ready) {
+            this._recording.removeEventListener(null, null, this);
</ins><span class="cx"> 
</span><del>-        if (action === this._recording.actions.lastValue && this._recordingProcessingOptionsContainer) {
-            this._recordingProcessingOptionsContainer.remove();
-            this._recordingProcessingOptionsContainer = null;
</del><ins>+            if (!this._recording[WI.CanvasSidebarPanel.SelectedActionSymbol])
+                this.action = this._recording.actions[0];
+
+            if (this._recordingProcessingOptionsContainer) {
+                this._recordingProcessingOptionsContainer.remove();
+                this._recordingProcessingOptionsContainer = null;
+            }
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRecordingActionTreeElementjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RecordingActionTreeElement.js (242510 => 242511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RecordingActionTreeElement.js    2019-03-05 22:00:57 UTC (rev 242510)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RecordingActionTreeElement.js       2019-03-05 22:05:15 UTC (rev 242511)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx">         this._index = index;
</span><span class="cx">         this._copyText = copyText;
</span><span class="cx"> 
</span><del>-        this.representedObject.addEventListener(WI.RecordingAction.Event.ValidityChanged, this._handleValidityChanged, this);
</del><ins>+        if (this.representedObject.valid)
+            this.representedObject.addEventListener(WI.RecordingAction.Event.ValidityChanged, this._handleValidityChanged, this);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Static
</span><span class="lines">@@ -453,6 +454,8 @@
</span><span class="cx">     _handleValidityChanged(event)
</span><span class="cx">     {
</span><span class="cx">         this.addClassName("invalid");
</span><ins>+
+        this.representedObject.removeEventListener(null, null, this);
</ins><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRecordingContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RecordingContentView.js (242510 => 242511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RecordingContentView.js  2019-03-05 22:00:57 UTC (rev 242510)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RecordingContentView.js     2019-03-05 22:05:15 UTC (rev 242511)
</span><span class="lines">@@ -167,7 +167,8 @@
</span><span class="cx">         this._sliderElement.min = 0;
</span><span class="cx">         this._sliderElement.max = 0;
</span><span class="cx"> 
</span><del>-        this.representedObject.addEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
</del><ins>+        if (!this.representedObject.ready)
+            this.representedObject.addEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     // Private
</span><span class="lines">@@ -486,6 +487,9 @@
</span><span class="cx">     {
</span><span class="cx">         this._sliderElement.max = this.representedObject.visualActionIndexes.length;
</span><span class="cx">         this._updateSliderValue();
</span><ins>+
+        if (this.representedObject.ready)
+            this.representedObject.removeEventListener(null, null, this);
</ins><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>