Changeset 242511 in webkit

Timestamp:

Mar 5, 2019, 2:05:15 PM (6 years ago)

Author:

Devin Rousso

Message:

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):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/Recording.js (modified) (3 diffs)
• UserInterface/Views/CanvasSidebarPanel.js (modified) (3 diffs)
• UserInterface/Views/RecordingActionTreeElement.js (modified) (2 diffs)
• UserInterface/Views/RecordingContentView.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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):
+
 2019-03-05  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/Recording.js

@@ -37 +37 @@
         this._displayName = WI.UIString("Recording");
 
-        this._swizzle = [];
+        this._swizzle = null;
         this._actions = [new WI.RecordingInitialStateAction].concat(...this._frames.map((frame) => frame.actions));
         this._visualActionIndexes = [];
@@ -296 +296 @@
     async swizzle(index, type)
     {
+        if (!this._swizzle)
+            this._swizzle = {};
+
         if (typeof this._swizzle[index] !== "object")
             this._swizzle[index] = {};
@@ -531 +534 @@
         }
 
+        this._swizzle = null;
         this._processContext = null;
         this._processing = false;

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

@@ -115 +115 @@
             return;
 
-        if (this._recording) {
-            this._recording.removeEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
-            this._recording.removeEventListener(WI.Recording.Event.StartProcessingFrame, this._handleRecordingStartProcessingFrame, this);
-        }
+        if (this._recording)
+            this._recording.removeEventListener(null, null, this);
 
         if (recording)
@@ -125 +123 @@
         this._recording = recording;
 
-        if (this._recording) {
+        if (this._recording && !this._recording.ready) {
             this._recording.addEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
             this._recording.addEventListener(WI.Recording.Event.StartProcessingFrame, this._handleRecordingStartProcessingFrame, this);
@@ -580 +578 @@
         this._createRecordingActionTreeElement(action, index, isInitialStateAction ? this._recordingTreeOutline : this._recordingTreeOutline.children.lastValue);
 
-        if (this._recording.ready && !this._recording[WI.CanvasSidebarPanel.SelectedActionSymbol])
-            this.action = this._recording.actions[0];
-
-        if (action === this._recording.actions.lastValue && this._recordingProcessingOptionsContainer) {
-            this._recordingProcessingOptionsContainer.remove();
-            this._recordingProcessingOptionsContainer = null;
+        if (this._recording.ready) {
+            this._recording.removeEventListener(null, null, this);
+
+            if (!this._recording[WI.CanvasSidebarPanel.SelectedActionSymbol])
+                this.action = this._recording.actions[0];
+
+            if (this._recordingProcessingOptionsContainer) {
+                this._recordingProcessingOptionsContainer.remove();
+                this._recordingProcessingOptionsContainer = null;
+            }
         }
     }

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

@@ -39 +39 @@
         this._copyText = copyText;
 
-        this.representedObject.addEventListener(WI.RecordingAction.Event.ValidityChanged, this._handleValidityChanged, this);
+        if (this.representedObject.valid)
+            this.representedObject.addEventListener(WI.RecordingAction.Event.ValidityChanged, this._handleValidityChanged, this);
     }
 
@@ -454 +455 @@
     {
         this.addClassName("invalid");
+
+        this.representedObject.removeEventListener(null, null, this);
     }
 };

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

@@ -168 +168 @@
         this._sliderElement.max = 0;
 
-        this.representedObject.addEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
+        if (!this.representedObject.ready)
+            this.representedObject.addEventListener(WI.Recording.Event.ProcessedAction, this._handleRecordingProcessedAction, this);
     }
 
@@ -487 +488 @@
         this._sliderElement.max = this.representedObject.visualActionIndexes.length;
         this._updateSliderValue();
+
+        if (this.representedObject.ready)
+            this.representedObject.removeEventListener(null, null, this);
     }
 };