Changeset 246555 in webkit

Timestamp:

Jun 18, 2019 12:09:37 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Canvas: imported recordings aren't selectable from the overview if there are no canvases in the page
​https://bugs.webkit.org/show_bug.cgi?id=198955

Reviewed by Joseph Pecoraro.

• UserInterface/Views/CanvasOverviewContentView.js:

(WI.CanvasOverviewContentView.prototype._addSavedRecording):
Hide the content placeholder when a recording is imported. It won't be shown again because
the subviews list will never be empty, as there's no way to remove an imported recording.

• UserInterface/Views/CollectionContentView.js:

(WI.CollectionContentView.prototype.addContentViewForItem):
(WI.CollectionContentView.prototype.removeContentViewForItem):
(WI.CollectionContentView.prototype.showContentPlaceholder): Added.
(WI.CollectionContentView.prototype.hideContentPlaceholder): Added.
(WI.CollectionContentView.prototype.initialLayout):
(WI.CollectionContentView.prototype._selectItem):
(WI.CollectionContentView.prototype._showContentPlaceholder): Deleted.
(WI.CollectionContentView.prototype._hideContentPlaceholder): Deleted.
Make showContentPlaceholder/hideContentPlaceholder protected for any subclasses to call.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CanvasOverviewContentView.js (modified) (1 diff)
• UserInterface/Views/CollectionContentView.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-06-18  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Canvas: imported recordings aren't selectable from the overview if there are no canvases in the page
+        https://bugs.webkit.org/show_bug.cgi?id=198955
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Views/CanvasOverviewContentView.js:
+        (WI.CanvasOverviewContentView.prototype._addSavedRecording):
+        Hide the content placeholder when a recording is imported. It won't be shown again because
+        the `subviews` list will never be empty, as there's no way to remove an imported recording.
+
+        * UserInterface/Views/CollectionContentView.js:
+        (WI.CollectionContentView.prototype.addContentViewForItem):
+        (WI.CollectionContentView.prototype.removeContentViewForItem):
+        (WI.CollectionContentView.prototype.showContentPlaceholder): Added.
+        (WI.CollectionContentView.prototype.hideContentPlaceholder): Added.
+        (WI.CollectionContentView.prototype.initialLayout):
+        (WI.CollectionContentView.prototype._selectItem):
+        (WI.CollectionContentView.prototype._showContentPlaceholder): Deleted.
+        (WI.CollectionContentView.prototype._hideContentPlaceholder): Deleted.
+        Make `showContentPlaceholder`/`hideContentPlaceholder` protected for any subclasses to call.
+
 2019-06-17  Matt Baker  <mattbaker@apple.com>
 

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

@@ -291 +291 @@
             let header = this._savedRecordingsContentView.element.appendChild(document.createElement("header"));
             header.textContent = WI.UIString("Saved Recordings");
+
+            this.hideContentPlaceholder();
         }
 

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

@@ -110 +110 @@
         }
 
-        this._hideContentPlaceholder();
+        this.hideContentPlaceholder();
 
         let contentView = new this._contentViewConstructor(item);
@@ -172 +172 @@
 
         if (!this.subviews.length)
-            this._showContentPlaceholder();
+            this.showContentPlaceholder();
     }
 
@@ -185 +185 @@
     }
 
-    initialLayout()
-    {
-        if (!this.representedObject.size || !this._contentViewConstructor) {
-            this._showContentPlaceholder();
-            return;
-        }
-    }
-
-    attached()
-    {
-        super.attached();
-
-        this.representedObject.addEventListener(WI.Collection.Event.ItemAdded, this._handleItemAdded, this);
-        this.representedObject.addEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
-
-        for (let item of this._contentViewMap.keys()) {
-            if (this.representedObject.has(item))
-                continue;
-
-            this.removeContentViewForItem(item);
-            if (this._selectedItem === item)
-                this._selectItem(null);
-        }
-
-        for (let item of this.representedObject) {
-            if (!this._contentViewMap.has(item))
-                this.addContentViewForItem(item);
-        }
-    }
-
-    detached()
-    {
-        this.representedObject.removeEventListener(null, null, this);
-
-        super.detached();
-    }
-
-     // Private
-
-    _handleItemAdded(event)
-    {
-        let item = event.data.item;
-        if (!item)
-            return;
-
-        this.addContentViewForItem(item);
-    }
-
-    _handleItemRemoved(event)
-    {
-        let item = event.data.item;
-        if (!item)
-            return;
-
-        this.removeContentViewForItem(item);
-    }
-
-    _handleContentError(event)
-    {
-        if (event && event.target)
-            this._removeContentViewForItem(event.target.representedObject);
-    }
-
-    _selectItem(item)
-    {
-        if (this._selectedItem === item)
-            return;
-
-        if (this._selectedItem) {
-            let contentView = this._contentViewMap.get(this._selectedItem);
-            console.assert(contentView, "Missing ContentView for deselected item.", this._selectedItem);
-            contentView.element.classList.remove("selected");
-        }
-
-        this._selectedItem = item;
-
-        if (this._selectedItem) {
-            let selectedContentView = this._contentViewMap.get(this._selectedItem);
-            console.assert(selectedContentView, "Missing ContentView for selected item.", this._selectedItem);
-            selectedContentView.element.classList.add("selected");
-        }
-
-        this.dispatchEventToListeners(WI.ContentView.Event.SupplementalRepresentedObjectsDidChange);
-    }
-
-    _showContentPlaceholder()
+    showContentPlaceholder()
     {
         if (!this._contentPlaceholderElement) {
@@ -283 +198 @@
     }
 
-    _hideContentPlaceholder()
+    hideContentPlaceholder()
     {
         if (this._contentPlaceholderElement)
             this._contentPlaceholderElement.remove();
     }
+
+    initialLayout()
+    {
+        if (!this.representedObject.size || !this._contentViewConstructor) {
+            this.showContentPlaceholder();
+            return;
+        }
+    }
+
+    attached()
+    {
+        super.attached();
+
+        this.representedObject.addEventListener(WI.Collection.Event.ItemAdded, this._handleItemAdded, this);
+        this.representedObject.addEventListener(WI.Collection.Event.ItemRemoved, this._handleItemRemoved, this);
+
+        for (let item of this._contentViewMap.keys()) {
+            if (this.representedObject.has(item))
+                continue;
+
+            this.removeContentViewForItem(item);
+            if (this._selectedItem === item)
+                this._selectItem(null);
+        }
+
+        for (let item of this.representedObject) {
+            if (!this._contentViewMap.has(item))
+                this.addContentViewForItem(item);
+        }
+    }
+
+    detached()
+    {
+        this.representedObject.removeEventListener(null, null, this);
+
+        super.detached();
+    }
+
+     // Private
+
+    _handleItemAdded(event)
+    {
+        let item = event.data.item;
+        if (!item)
+            return;
+
+        this.addContentViewForItem(item);
+    }
+
+    _handleItemRemoved(event)
+    {
+        let item = event.data.item;
+        if (!item)
+            return;
+
+        this.removeContentViewForItem(item);
+    }
+
+    _handleContentError(event)
+    {
+        if (event && event.target)
+            this._removeContentViewForItem(event.target.representedObject);
+    }
+
+    _selectItem(item)
+    {
+        if (this._selectedItem === item)
+            return;
+
+        if (this._selectedItem) {
+            let contentView = this._contentViewMap.get(this._selectedItem);
+            console.assert(contentView, "Missing ContentView for deselected item.", this._selectedItem);
+            contentView.element.classList.remove("selected");
+        }
+
+        this._selectedItem = item;
+
+        if (this._selectedItem) {
+            let selectedContentView = this._contentViewMap.get(this._selectedItem);
+            console.assert(selectedContentView, "Missing ContentView for selected item.", this._selectedItem);
+            selectedContentView.element.classList.add("selected");
+        }
+
+        this.dispatchEventToListeners(WI.ContentView.Event.SupplementalRepresentedObjectsDidChange);
+    }
 };