Changeset 224200 in webkit

Timestamp:

Oct 30, 2017 1:53:02 PM (6 years ago)

Author:

webkit@devinrousso.com

Message:

Web Inspector: Canvas Tab: no path components shown in recording content view after selecting a recording via View Recordings... dropdown
​https://bugs.webkit.org/show_bug.cgi?id=178807
<rdar://problem/35176463>

Reviewed by Brian Burg.

When the first Recording is taken of a canvas, it is immediately added as a child. When the
CanvasTreeElement is attached, however, it will attempt to regenerate its children if
necessary. This is especially true for canvases with ShaderPrograms, as they are added with
addRepresentedObjectToNewChildQueue, meaning that the child TreeElements aren't actually
added until the next tick, preventing the ContentBrowser logic from generating path
components correctly.

This patch switches to using addChildForRepresentedObject so that there is no delay when
adding children, and also ensures that any existing recordings are also added on regeneration.

• UserInterface/Views/CanvasTabContentView.js:

(WI.CanvasTabContentView.prototype._recordingAdded):
Move logic for adding TreeElements for new Recordings to CanvasTreeElement.

• UserInterface/Views/CanvasTreeElement.js:

(WI.CanvasTreeElement.createRecordingTreeElement):
(WI.CanvasTreeElement):
(WI.CanvasTreeElement.prototype.onattach):
(WI.CanvasTreeElement.prototype.ondetach):
(WI.CanvasTreeElement.prototype.onpopulate):
(WI.CanvasTreeElement.prototype._handleItemAdded):
(WI.CanvasTreeElement.prototype._handleItemRemoved):
(WI.CanvasTreeElement.prototype._shaderProgramAdded): Deleted.
(WI.CanvasTreeElement.prototype._shaderProgramRemoved): Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CanvasTabContentView.js (modified) (1 diff)
• UserInterface/Views/CanvasTreeElement.js (modified) (5 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-10-30  Devin Rousso  <webkit@devinrousso.com>
+
+        Web Inspector: Canvas Tab: no path components shown in recording content view after selecting a recording via View Recordings... dropdown
+        https://bugs.webkit.org/show_bug.cgi?id=178807
+        <rdar://problem/35176463>
+
+        Reviewed by Brian Burg.
+
+        When the first Recording is taken of a canvas, it is immediately added as a child. When the
+        CanvasTreeElement is `attached`, however, it will attempt to regenerate its children if
+        necessary. This is especially true for canvases with ShaderPrograms, as they are added with
+        `addRepresentedObjectToNewChildQueue`, meaning that the child TreeElements aren't actually
+        added until the next tick, preventing the ContentBrowser logic from generating path
+        components correctly.
+
+        This patch switches to using `addChildForRepresentedObject` so that there is no delay when
+        adding children, and also ensures that any existing recordings are also added on regeneration.
+
+        * UserInterface/Views/CanvasTabContentView.js:
+        (WI.CanvasTabContentView.prototype._recordingAdded):
+        Move logic for adding TreeElements for new Recordings to CanvasTreeElement.
+
+        * UserInterface/Views/CanvasTreeElement.js:
+        (WI.CanvasTreeElement.createRecordingTreeElement):
+        (WI.CanvasTreeElement):
+        (WI.CanvasTreeElement.prototype.onattach):
+        (WI.CanvasTreeElement.prototype.ondetach):
+        (WI.CanvasTreeElement.prototype.onpopulate):
+        (WI.CanvasTreeElement.prototype._handleItemAdded):
+        (WI.CanvasTreeElement.prototype._handleItemRemoved):
+        (WI.CanvasTreeElement.prototype._shaderProgramAdded): Deleted.
+        (WI.CanvasTreeElement.prototype._shaderProgramRemoved): Deleted.
+
 2017-10-30  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -285 +285 @@
     _recordingAdded(recording, options = {})
     {
-        const subtitle = null;
-        let recordingTreeElement = new WI.GeneralTreeElement(["recording"], recording.displayName, subtitle, recording);
-
-        if (recording.source) {
-            let canvasTreeElement = this._canvasTreeOutline.findTreeElement(recording.source);
-            console.assert(canvasTreeElement, "Missing tree element for canvas.", recording.source);
-            if (canvasTreeElement)
-                canvasTreeElement.appendChild(recordingTreeElement);
-        } else
+        if (!recording.source) {
+            const subtitle = null;
+            let recordingTreeElement = new WI.GeneralTreeElement(["recording"], recording.displayName, subtitle, recording);
             this._canvasTreeOutline.appendChild(recordingTreeElement);
+        }
 
         if (!options.suppressShowRecording) {

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

@@ -34 +34 @@
 
         this.registerFolderizeSettings("shader-programs", WI.UIString("Shader Programs"), this.representedObject.shaderProgramCollection, WI.ShaderProgramTreeElement);
+
+        function createRecordingTreeElement(recording) {
+            return new WI.GeneralTreeElement(["recording"], recording.displayName, subtitle, recording);
+        }
+        this.registerFolderizeSettings("recordings", WI.UIString("Recordings"), this.representedObject.recordingCollection, createRecordingTreeElement);
     }
 
@@ -42 +47 @@
         super.onattach();
 
-        this.representedObject.shaderProgramCollection.addEventListener(WI.Collection.Event.ItemAdded, this._shaderProgramAdded, this);
-        this.representedObject.shaderProgramCollection.addEventListener(WI.Collection.Event.ItemRemoved, this._shaderProgramRemoved, this);
+        this.representedObject.shaderProgramCollection.addEventListener(WI.Collection.Event.ItemAdded, this._handleItemAdded, this);
+        this.representedObject.shaderProgramCollection.addEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
+
+        this.representedObject.recordingCollection.addEventListener(WI.Collection.Event.ItemAdded, this._handleItemAdded, this);
+        this.representedObject.recordingCollection.addEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
 
         this.element.addEventListener("mouseover", this._handleMouseOver.bind(this));
@@ -53 +61 @@
     ondetach()
     {
-        this.representedObject.shaderProgramCollection.removeEventListener(WI.Collection.Event.ItemAdded, this._shaderProgramAdded, this);
-        this.representedObject.shaderProgramCollection.removeEventListener(WI.Collection.Event.ItemRemoved, this._shaderProgramRemoved, this);
+        this.representedObject.shaderProgramCollection.removeEventListener(WI.Collection.Event.ItemAdded, this._handleItemAdded, this);
+        this.representedObject.shaderProgramCollection.removeEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
+
+        this.representedObject.recordingCollection.removeEventListener(WI.Collection.Event.ItemAdded, this._handleItemAdded, this);
+        this.representedObject.recordingCollection.removeEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
 
         super.ondetach();
@@ -72 +83 @@
         for (let program of this.representedObject.shaderProgramCollection.items)
             this.addChildForRepresentedObject(program);
+
+        for (let recording of this.representedObject.recordingCollection.items)
+            this.addChildForRepresentedObject(recording);
     }
 
@@ -94 +108 @@
     // Private
 
-    _shaderProgramAdded(event)
+    _handleItemAdded(event)
     {
-        this.addRepresentedObjectToNewChildQueue(event.data.item);
+        this.addChildForRepresentedObject(event.data.item);
     }
 
-    _shaderProgramRemoved(event)
+    _handleItemRemoved(event)
     {
         this.removeChildForRepresentedObject(event.data.item);