Attachment 372327 Details for Bug 198955 – Patch

[patch] Patch

bug-198955-20190617223211.patch (text/plain), 5.43 KB, created by Devin Rousso on 2019-06-17 22:32:11 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-17 22:32:11 PDT

Size: 5.43 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index d8a0087b090b84c273c215a6ed018e360ba099a7..63982646b54c752e92187bf79b5e77a725a40556 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,26 @@
>+2019-06-17  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 NOBODY (OOPS!).
>+
>+        * 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>
> 
>         Web Inspector: Elements: remove ellipses from "Break on" context menu item title
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js b/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
>index ded3cb8c1be00dbc5e3e5be83d6a0de1ce5f0fdb..2ef64f035d5ec881ac0338293710127a5e6a4d6e 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasOverviewContentView.js
>@@ -290,6 +290,8 @@ WI.CanvasOverviewContentView = class CanvasOverviewContentView extends WI.Collec
> 
>             let header = this._savedRecordingsContentView.element.appendChild(document.createElement("header"));
>             header.textContent = WI.UIString("Saved Recordings");
>+
>+            this.hideContentPlaceholder();
>         }
> 
>         if (!this._savedRecordingsTreeOutline) {
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js b/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js
>index 110df7074b16b06906408c320dbf48356252a660..b744c1d8e62e6a8cf9326e19598c368f867a997d 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CollectionContentView.js
>@@ -109,7 +109,7 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
>             return;
>         }
> 
>-        this._hideContentPlaceholder();
>+        this.hideContentPlaceholder();
> 
>         let contentView = new this._contentViewConstructor(item);
>         console.assert(contentView instanceof WI.ContentView);
>@@ -171,7 +171,7 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
>         }
> 
>         if (!this.subviews.length)
>-            this._showContentPlaceholder();
>+            this.showContentPlaceholder();
>     }
> 
>     contentViewAdded(contentView)
>@@ -184,10 +184,29 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
>         // Implemented by subclasses.
>     }
> 
>+    showContentPlaceholder()
>+    {
>+        if (!this._contentPlaceholderElement) {
>+            if (typeof this._contentPlaceholder === "string")
>+                this._contentPlaceholderElement = WI.createMessageTextView(this._contentPlaceholder);
>+            else if (this._contentPlaceholder instanceof HTMLElement)
>+                this._contentPlaceholderElement = this._contentPlaceholder;
>+        }
>+
>+        if (!this._contentPlaceholderElement.parentNode)
>+            this.element.appendChild(this._contentPlaceholderElement);
>+    }
>+
>+    hideContentPlaceholder()
>+    {
>+        if (this._contentPlaceholderElement)
>+            this._contentPlaceholderElement.remove();
>+    }
>+
>     initialLayout()
>     {
>         if (!this.representedObject.size || !this._contentViewConstructor) {
>-            this._showContentPlaceholder();
>+            this.showContentPlaceholder();
>             return;
>         }
>     }
>@@ -268,23 +287,4 @@ WI.CollectionContentView = class CollectionContentView extends WI.ContentView
> 
>         this.dispatchEventToListeners(WI.ContentView.Event.SupplementalRepresentedObjectsDidChange);
>     }
>-
>-    _showContentPlaceholder()
>-    {
>-        if (!this._contentPlaceholderElement) {
>-            if (typeof this._contentPlaceholder === "string")
>-                this._contentPlaceholderElement = WI.createMessageTextView(this._contentPlaceholder);
>-            else if (this._contentPlaceholder instanceof HTMLElement)
>-                this._contentPlaceholderElement = this._contentPlaceholder;
>-        }
>-
>-        if (!this._contentPlaceholderElement.parentNode)
>-            this.element.appendChild(this._contentPlaceholderElement);
>-    }
>-
>-    _hideContentPlaceholder()
>-    {
>-        if (this._contentPlaceholderElement)
>-            this._contentPlaceholderElement.remove();
>-    }
> };

Actions: View | Formatted Diff | Diff

Attachments on bug 198955: 372327