Attachment 347681 Details for Bug 188808 – Patch

[patch] Patch

bug-188808-20180821133113.patch (text/plain), 4.08 KB, created by Devin Rousso on 2018-08-21 13:31:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2018-08-21 13:31:14 PDT

Size: 4.08 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index ed1b5709bc6833de3228b1eeff5e326323cb0b1d..d758ab0f0dad9cbe9b8cb1854d5e130c9b24da7f 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,19 @@
>+2018-08-21  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: REGRESSION(r235095): duplicate actions existing in WI.CanvasSidebarPanel
>+        https://bugs.webkit.org/show_bug.cgi?id=188808
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/CanvasSidebarPanel.js:
>+        (WI.CanvasSidebarPanel.prototype._recordingChanged):
>+        Check that the `WI.RecordingAction` is not already represented in the `WI.TreeOutline`
>+        before adding it.
>+
>+        * UserInterface/Views/CanvasSidebarPanel.css:
>+        (.sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline .item.processing .subtitle > progress):
>+        Drive-by: vertically center the <progress> shown for `WI.RecordingFrame` during processing.
>+
> 2018-08-20  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: allow breakpoints to be set for specific event listeners
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css b/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css
>index 0d1a5e4bc8495cf21c6661c4f029feca6a15e8f9..42660beed4139e5c54418a51b4db00984a7fa531 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.css
>@@ -75,7 +75,8 @@
> .sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline .item.processing .subtitle > progress {
>     width: 100%;
>     max-width: 100px;
>-    margin: 2px 4px 0;
>+    margin: 0 4px;
>+    vertical-align: -3px;
> }
> 
> .sidebar > .panel.navigation.canvas > .content > .recording-content > .tree-outline:matches(:focus, .force-focus) .item.processing.selected .subtitle > progress {
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js b/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
>index 68b1817d612296d25f315ff3c2a2c5544af34ad3..34653daf2dbd41c0b0e2b5372aeed4eaaac94081 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CanvasSidebarPanel.js
>@@ -407,11 +407,12 @@ WI.CanvasSidebarPanel = class CanvasSidebarPanel extends WI.NavigationSidebarPan
>             scopeBarItem.selected = true;
>         }
> 
>-        if (this._recording.actions[0].ready) {
>-            this._recordingTreeOutline.appendChild(new WI.RecordingActionTreeElement(this._recording.actions[0], 0, this._recording.type));
>+        let initialStateAction = this._recording.actions[0];
>+        if (initialStateAction.ready && !this._recordingTreeOutline.getCachedTreeElement(initialStateAction)) {
>+            this._recordingTreeOutline.appendChild(new WI.RecordingActionTreeElement(initialStateAction, 0, this._recording.type));
> 
>             if (!this._recording[WI.CanvasSidebarPanel.SelectedActionSymbol])
>-                this.action = this._recording.actions[0];
>+                this.action = initialStateAction;
>         }
> 
>         let cumulativeActionIndex = 0;
>@@ -419,14 +420,16 @@ WI.CanvasSidebarPanel = class CanvasSidebarPanel extends WI.NavigationSidebarPan
>             if (!frame.actions[0].ready)
>                 return;
> 
>-            let folder = this._createRecordingFrameTreeElement(frame, frameIndex, this._recordingTreeOutline);
>+            let folder = this._recordingTreeOutline.getCachedTreeElement(frame);
>+            if (!folder)
>+                folder = this._createRecordingFrameTreeElement(frame, frameIndex, this._recordingTreeOutline);
> 
>             for (let action of frame.actions) {
>-                if (!action.ready)
>-                    break;
>-
>                 ++cumulativeActionIndex;
> 
>+                if (!action.ready || this._recordingTreeOutline.getCachedTreeElement(action))
>+                    break;
>+
>                 this._createRecordingActionTreeElement(action, cumulativeActionIndex, folder);
>             }
>         });

Actions: View | Formatted Diff | Diff

Attachments on bug 188808: 347681