Attachment 373579 Details for Bug 199555 – Patch

[patch] Patch

bug-199555-20190706131632.patch (text/plain), 13.40 KB, created by Devin Rousso on 2019-07-06 13:16:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-07-06 13:16:32 PDT

Size: 13.40 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 81b5be3e689e68d8dd6e2fd96a6bdecc06460d12..bcd5edb62e21f7735a0c98467df14bf94d018765 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,29 @@
>+2019-07-06  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Layers: Uncaught Exception: Request with id = 2 failed. {"code":-32601,"message":"'Page' domain was not found","data":[{"code":-32601,"message":"'Page' domain was not found"}]}
>+        https://bugs.webkit.org/show_bug.cgi?id=199555
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Use modern inspected target support checking, and defer agent commands until a target is
>+        available.
>+
>+        * UserInterface/Views/Layers3DContentView.js:
>+        (WI.Layers3DContentView):
>+        (WI.Layers3DContentView.prototype.get navigationItems):
>+        (WI.Layers3DContentView.prototype._showPaintRectsSettingChanged):
>+        (WI.Layers3DContentView.prototype._updateCompositingBordersButtonState):
>+        (WI.Layers3DContentView.prototype._toggleCompositingBorders):
>+
>+        * UserInterface/Views/DOMTreeContentView.js:
>+        (WI.DOMTreeContentView):
>+        (WI.DOMTreeContentView.prototype._toggleCompositingBorders):
>+        (WI.DOMTreeContentView.prototype._updateCompositingBordersButtonToMatchPageSettings):
>+        (WI.DOMTreeContentView.prototype._showPaintRectsSettingChanged):
>+        (WI.DOMTreeContentView.prototype._showPrintStylesChanged):
>+        (WI.DOMTreeContentView.prototype._showRulersChanged):
>+        Drive-by: apply the same changes to the Elements tab for when the Layers tab isn't enabled.
>+
> 2019-07-05  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: current call frame indicator not visible in dark mode
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js
>index 5db19b81fcab70137b4fa6559daddb002695f58c..6935515562cf4d50200ea9787793383976e49475 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js
>@@ -34,16 +34,16 @@ WI.DOMTreeContentView = class DOMTreeContentView extends WI.ContentView
>         if (InspectorBackend.domains.Page) {
>             this._compositingBordersButtonNavigationItem = new WI.ActivateButtonNavigationItem("layer-borders", WI.UIString("Show compositing borders"), WI.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13);
>             this._compositingBordersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this);
>-            this._compositingBordersButtonNavigationItem.enabled = !!PageAgent.getCompositingBordersVisible;
>+            this._compositingBordersButtonNavigationItem.enabled = !!InspectorBackend.domains.Page.getCompositingBordersVisible;
>             this._compositingBordersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
>         }
> 
>-        if (InspectorBackend.domains.Page) {
>+        if (InspectorBackend.domains.Page && InspectorBackend.domains.Page.showPaintRects) {
>             WI.settings.showPaintRects.addEventListener(WI.Setting.Event.Changed, this._showPaintRectsSettingChanged, this);
>             this._paintFlashingButtonNavigationItem = new WI.ActivateButtonNavigationItem("paint-flashing", WI.UIString("Enable paint flashing"), WI.UIString("Disable paint flashing"), "Images/Paint.svg", 16, 16);
>             this._paintFlashingButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this);
>-            this._paintFlashingButtonNavigationItem.enabled = !!PageAgent.setShowPaintRects;
>-            this._paintFlashingButtonNavigationItem.activated = PageAgent.setShowPaintRects && WI.settings.showPaintRects.value;
>+            this._paintFlashingButtonNavigationItem.enabled = !!InspectorBackend.domains.Page.setShowPaintRects;
>+            this._paintFlashingButtonNavigationItem.activated = InspectorBackend.domains.Page.setShowPaintRects && WI.settings.showPaintRects.value;
>             this._paintFlashingButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
>         }
> 
>@@ -592,11 +592,12 @@ WI.DOMTreeContentView = class DOMTreeContentView extends WI.ContentView
> 
>     _toggleCompositingBorders(event)
>     {
>-        console.assert(PageAgent.setCompositingBordersVisible);
>-
>         var activated = !this._compositingBordersButtonNavigationItem.activated;
>         this._compositingBordersButtonNavigationItem.activated = activated;
>-        PageAgent.setCompositingBordersVisible(activated);
>+        for (let target of WI.targets) {
>+            if (target.PageAgent)
>+               target.PageAgent.setCompositingBordersVisible(activated);
>+        }
>     }
> 
>     _togglePaintFlashing(event)
>@@ -609,6 +610,16 @@ WI.DOMTreeContentView = class DOMTreeContentView extends WI.ContentView
>         if (WI.settings.experimentalEnableLayersTab.value)
>             return;
> 
>+        if (!WI.targetsAvailable()) {
>+            WI.whenTargetsAvailable().then(() => {
>+                this._updateCompositingBordersButtonToMatchPageSettings();
>+            });
>+            return;
>+        }
>+
>+        if (!window.PageAgent)
>+            return;
>+
>         var button = this._compositingBordersButtonNavigationItem;
> 
>         // We need to sync with the page settings since these can be controlled
>@@ -621,11 +632,12 @@ WI.DOMTreeContentView = class DOMTreeContentView extends WI.ContentView
> 
>     _showPaintRectsSettingChanged(event)
>     {
>-        console.assert(PageAgent.setShowPaintRects);
>-
>-        this._paintFlashingButtonNavigationItem.activated = WI.settings.showPaintRects.value;
>-
>-        PageAgent.setShowPaintRects(this._paintFlashingButtonNavigationItem.activated);
>+        let activated = WI.settings.showPaintRects.value;
>+        this._paintFlashingButtonNavigationItem.activated = activated;
>+        for (let target of WI.targets) {
>+            if (target.PageAgent && target.PageAgent.setShowPaintRects)
>+               target.PageAgent.setShowPaintRects(activated);
>+        }
>     }
> 
>     _showShadowDOMSettingChanged(event)
>@@ -643,7 +655,10 @@ WI.DOMTreeContentView = class DOMTreeContentView extends WI.ContentView
>         this._showPrintStylesButtonNavigationItem.activated = WI.printStylesEnabled;
> 
>         let mediaType = WI.printStylesEnabled ? "print" : "";
>-        PageAgent.setEmulatedMedia(mediaType);
>+        for (let target of WI.targets) {
>+            if (target.PageAgent)
>+               target.PageAgent.setEmulatedMedia(mediaType);
>+        }
> 
>         WI.cssManager.mediaTypeChanged();
>     }
>@@ -721,11 +736,12 @@ WI.DOMTreeContentView = class DOMTreeContentView extends WI.ContentView
> 
>     _showRulersChanged()
>     {
>-        console.assert(PageAgent.setShowRulers);
>-
>-        this._showRulersButtonNavigationItem.activated = WI.settings.showRulers.value;
>-
>-        PageAgent.setShowRulers(this._showRulersButtonNavigationItem.activated);
>+        let activated = WI.settings.showRulers.value;
>+        this._showRulersButtonNavigationItem.activated = activated;
>+        for (let target of WI.targets) {
>+            if (target.PageAgent && target.PageAgent.setShowRulers)
>+               target.PageAgent.setCompositingBordersVisible(activated);
>+        }
>     }
> 
>     _toggleShowRulers(event)
>diff --git a/Source/WebInspectorUI/UserInterface/Views/Layers3DContentView.js b/Source/WebInspectorUI/UserInterface/Views/Layers3DContentView.js
>index a53667ac7f4379f90221b1aa631f8a498b6cc5af..8cb7606fc53e0f9657ebb9cd8dfac396dac26da4 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/Layers3DContentView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/Layers3DContentView.js
>@@ -31,16 +31,20 @@ WI.Layers3DContentView = class Layers3DContentView extends WI.ContentView
> 
>         this.element.classList.add("layers-3d");
> 
>-        this._compositingBordersButtonNavigationItem = new WI.ActivateButtonNavigationItem("layer-borders", WI.UIString("Show compositing borders"), WI.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13);
>-        this._compositingBordersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this);
>-        this._compositingBordersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
>+        if (InspectorBackend.domains.Page) {
>+            this._compositingBordersButtonNavigationItem = new WI.ActivateButtonNavigationItem("layer-borders", WI.UIString("Show compositing borders"), WI.UIString("Hide compositing borders"), "Images/LayerBorders.svg", 13, 13);
>+            this._compositingBordersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleCompositingBorders, this);
>+            this._compositingBordersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
>+        }
> 
>-        WI.settings.showPaintRects.addEventListener(WI.Setting.Event.Changed, this._showPaintRectsSettingChanged, this);
>-        this._paintFlashingButtonNavigationItem = new WI.ActivateButtonNavigationItem("paint-flashing", WI.UIString("Enable paint flashing"), WI.UIString("Disable paint flashing"), "Images/Paint.svg", 16, 16);
>-        this._paintFlashingButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this);
>-        this._paintFlashingButtonNavigationItem.enabled = !!PageAgent.setShowPaintRects;
>-        this._paintFlashingButtonNavigationItem.activated = PageAgent.setShowPaintRects && WI.settings.showPaintRects.value;
>-        this._paintFlashingButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
>+        if (InspectorBackend.domains.Page && InspectorBackend.domains.Page.showPaintRects) {
>+            WI.settings.showPaintRects.addEventListener(WI.Setting.Event.Changed, this._showPaintRectsSettingChanged, this);
>+            this._paintFlashingButtonNavigationItem = new WI.ActivateButtonNavigationItem("paint-flashing", WI.UIString("Enable paint flashing"), WI.UIString("Disable paint flashing"), "Images/Paint.svg", 16, 16);
>+            this._paintFlashingButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePaintFlashing, this);
>+            this._paintFlashingButtonNavigationItem.enabled = !!InspectorBackend.domains.Page.setShowPaintRects;
>+            this._paintFlashingButtonNavigationItem.activated = InspectorBackend.domains.Page.setShowPaintRects && WI.settings.showPaintRects.value;
>+            this._paintFlashingButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
>+        }
> 
>         this._layers = [];
>         this._layerGroupsById = new Map;
>@@ -67,7 +71,12 @@ WI.Layers3DContentView = class Layers3DContentView extends WI.ContentView
> 
>     get navigationItems()
>     {
>-        return [this._compositingBordersButtonNavigationItem, this._paintFlashingButtonNavigationItem];
>+        let navigationItems = [];
>+        if (this._compositingBordersButtonNavigationItem)
>+            navigationItems.push(this._compositingBordersButtonNavigationItem);
>+        if (this._paintFlashingButtonNavigationItem)
>+            navigationItems.push(this._paintFlashingButtonNavigationItem);
>+        return navigationItems;
>     }
> 
>     get supplementalRepresentedObjects()
>@@ -392,10 +401,12 @@ WI.Layers3DContentView = class Layers3DContentView extends WI.ContentView
> 
>     _showPaintRectsSettingChanged(event)
>     {
>-        console.assert(PageAgent.setShowPaintRects);
>-
>-        this._paintFlashingButtonNavigationItem.activated = WI.settings.showPaintRects.value;
>-        PageAgent.setShowPaintRects(this._paintFlashingButtonNavigationItem.activated);
>+        let activated = WI.settings.showPaintRects.value;
>+        this._paintFlashingButtonNavigationItem.activated = activated;
>+        for (let target of WI.targets) {
>+            if (target.PageAgent && target.PageAgent.setShowPaintRects)
>+               target.PageAgent.setShowPaintRects(activated);
>+        }
>     }
> 
>     _togglePaintFlashing(event)
>@@ -405,6 +416,16 @@ WI.Layers3DContentView = class Layers3DContentView extends WI.ContentView
> 
>     _updateCompositingBordersButtonState()
>     {
>+        if (!WI.targetsAvailable()) {
>+            WI.whenTargetsAvailable().then(() => {
>+                this._updateCompositingBordersButtonState();
>+            });
>+            return;
>+        }
>+
>+        if (!window.PageAgent)
>+            return;
>+
>         // This value can be changed outside of Web Inspector.
>         // FIXME: Have PageAgent dispatch a change event instead?
>         PageAgent.getCompositingBordersVisible((error, compositingBordersVisible) => {
>@@ -415,8 +436,12 @@ WI.Layers3DContentView = class Layers3DContentView extends WI.ContentView
> 
>     _toggleCompositingBorders(event)
>     {
>-        this._compositingBordersButtonNavigationItem.activated = !this._compositingBordersButtonNavigationItem.activated;
>-        PageAgent.setCompositingBordersVisible(this._compositingBordersButtonNavigationItem.activated);
>+        let activated = !this._compositingBordersButtonNavigationItem.activated;
>+        this._compositingBordersButtonNavigationItem.activated = activated;
>+        for (let target of WI.targets) {
>+            if (target.PageAgent && target.PageAgent.setCompositingBordersVisible)
>+               target.PageAgent.setCompositingBordersVisible(activated);
>+        }
>     }
> 
>     _buildLayerInfoElement()

Actions: View | Formatted Diff | Diff

Attachments on bug 199555: 373579 | 373674 | 373930