[webkit-changes] [246176] trunk/Source/WebInspectorUI

Thu, 06 Jun 2019 16:30:13 -0700

Title: [246176] trunk/Source/WebInspectorUI
Revision
246176
Author
[email protected]
Date
2019-06-06 16:28:34 -0700 (Thu, 06 Jun 2019)

Log Message

Web Inspector: Elements: print/rulers/compositing/paint navigation items shouldn't be visible if the inspected target doesn't have a PageAgent
https://bugs.webkit.org/show_bug.cgi?id=198410

Reviewed by Timothy Hatcher.

* UserInterface/Views/DOMTreeContentView.js:
(WI.DOMTreeContentView):
(WI.DOMTreeContentView.prototype.get navigationItems):
(WI.DOMTreeContentView.prototype._showRulersChanged):

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (246175 => 246176)


--- trunk/Source/WebInspectorUI/ChangeLog	2019-06-06 23:19:59 UTC (rev 246175)
+++ trunk/Source/WebInspectorUI/ChangeLog	2019-06-06 23:28:34 UTC (rev 246176)
@@ -1 +1,13 @@
+2019-06-06  Devin Rousso  <[email protected]>
+
+        Web Inspector: Elements: print/rulers/compositing/paint navigation items shouldn't be visible if the inspected target doesn't have a PageAgent
+        https://bugs.webkit.org/show_bug.cgi?id=198410
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/DOMTreeContentView.js:
+        (WI.DOMTreeContentView):
+        (WI.DOMTreeContentView.prototype.get navigationItems):
+        (WI.DOMTreeContentView.prototype._showRulersChanged):
+
 == Rolled over to ChangeLog-2019-06-05 ==

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js (246175 => 246176)


--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js	2019-06-06 23:19:59 UTC (rev 246175)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMTreeContentView.js	2019-06-06 23:28:34 UTC (rev 246176)
@@ -31,17 +31,21 @@
 
         super(representedObject);
 
-        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.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.enabled = !!PageAgent.getCompositingBordersVisible;
+            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) {
+            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;
+        }
 
         WI.settings.showShadowDOM.addEventListener(WI.Setting.Event.Changed, this._showShadowDOMSettingChanged, this);
         this._showsShadowDOMButtonNavigationItem = new WI.ActivateButtonNavigationItem("shows-shadow-DOM", WI.UIString("Show shadow DOM nodes"), WI.UIString("Hide shadow DOM nodes"), "Images/ShadowDOM.svg", 13, 13);
@@ -49,16 +53,21 @@
         this._showsShadowDOMButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
         this._showShadowDOMSettingChanged();
 
-        this._showPrintStylesButtonNavigationItem = new WI.ActivateButtonNavigationItem("print-styles", WI.UIString("Force Print Media Styles"), WI.UIString("Use Default Media Styles"), "Images/Printer.svg", 16, 16);
-        this._showPrintStylesButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePrintStyles, this);
-        this._showPrintStylesButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
-        this._showPrintStylesChanged();
+        if (InspectorBackend.domains.Page) {
+            this._showPrintStylesButtonNavigationItem = new WI.ActivateButtonNavigationItem("print-styles", WI.UIString("Force Print Media Styles"), WI.UIString("Use Default Media Styles"), "Images/Printer.svg", 16, 16);
+            this._showPrintStylesButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._togglePrintStyles, this);
+            this._showPrintStylesButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
+            this._showPrintStylesChanged();
+        }
 
-        WI.settings.showRulers.addEventListener(WI.Setting.Event.Changed, this._showRulersChanged, this);
-        this._showRulersButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-rulers", WI.UIString("Show Rulers"), WI.UIString("Hide Rulers"), "Images/Rulers.svg", 16, 16);
-        this._showRulersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleShowRulers, this);
-        this._showRulersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
-        this._showRulersChanged();
+        // COMPATIBILITY (iOS 11.3)
+        if (InspectorBackend.domains.Page && InspectorBackend.domains.Page.setShowRulers) {
+            WI.settings.showRulers.addEventListener(WI.Setting.Event.Changed, this._showRulersChanged, this);
+            this._showRulersButtonNavigationItem = new WI.ActivateButtonNavigationItem("show-rulers", WI.UIString("Show Rulers"), WI.UIString("Hide Rulers"), "Images/Rulers.svg", 16, 16);
+            this._showRulersButtonNavigationItem.addEventListener(WI.ButtonNavigationItem.Event.Clicked, this._toggleShowRulers, this);
+            this._showRulersButtonNavigationItem.visibilityPriority = WI.NavigationItem.VisibilityPriority.Low;
+            this._showRulersChanged();
+        }
 
         this.element.classList.add("dom-tree");
         this.element.addEventListener("click", this._mouseWasClicked.bind(this), false);
@@ -106,18 +115,27 @@
 
     get navigationItems()
     {
-        let items = [this._showPrintStylesButtonNavigationItem, this._showsShadowDOMButtonNavigationItem];
+        let items = [];
 
+        if (this._showPrintStylesButtonNavigationItem)
+            items.push(this._showPrintStylesButtonNavigationItem);
+
+        items.push(this._showsShadowDOMButtonNavigationItem);
+
         if (this._forceAppearanceButtonNavigationItem)
-            items.unshift(this._forceAppearanceButtonNavigationItem);
+            items.push(this._forceAppearanceButtonNavigationItem);
 
-        // COMPATIBILITY (iOS 11.3)
-        if (window.PageAgent && PageAgent.setShowRulers)
-            items.unshift(this._showRulersButtonNavigationItem);
+        if (this._showRulersButtonNavigationItem)
+           items.unshift(this._showRulersButtonNavigationItem);
 
-        if (!WI.settings.experimentalEnableLayersTab.value)
-            items.push(this._compositingBordersButtonNavigationItem, this._paintFlashingButtonNavigationItem);
+        if (!WI.settings.experimentalEnableLayersTab.value) {
+            if (this._compositingBordersButtonNavigationItem)
+                items.push(this._compositingBordersButtonNavigationItem);
 
+            if (this._paintFlashingButtonNavigationItem)
+                items.push(this._paintFlashingButtonNavigationItem);
+       }
+
         return items;
     }
 
@@ -690,12 +708,10 @@
 
     _showRulersChanged()
     {
+        console.assert(PageAgent.setShowRulers);
+
         this._showRulersButtonNavigationItem.activated = WI.settings.showRulers.value;
 
-        // COMPATIBILITY (iOS 11.3)
-        if (!PageAgent.setShowRulers)
-            return;
-
         PageAgent.setShowRulers(this._showRulersButtonNavigationItem.activated);
     }
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to