Changeset 243152 in webkit

Timestamp:

Mar 19, 2019, 11:03:33 AM (8 years ago)

Author:

Devin Rousso

Message:

Web Inspector: DOM: "Capture Screenshot" should only be shown if the node is attached
​https://bugs.webkit.org/show_bug.cgi?id=195793
<rdar://problem/48916594>

Reviewed by Joseph Pecoraro.

• UserInterface/Models/DOMNode.js:

(WI.DOMNode.prototype.get attached): Added.

• UserInterface/Views/ContextMenuUtilities.js:

(WI.appendContextMenuItemsForDOMNode):

• UserInterface/Views/DOMTreeElement.js:

(WI.DOMTreeElement.prototype._populateTagContextMenu):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/DOMNode.js (modified) (1 diff)
• UserInterface/Views/ContextMenuUtilities.js (modified) (7 diffs)
• UserInterface/Views/DOMTreeElement.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-03-19  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: DOM: "Capture Screenshot" should only be shown if the node is attached
+        https://bugs.webkit.org/show_bug.cgi?id=195793
+        <rdar://problem/48916594>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Models/DOMNode.js:
+        (WI.DOMNode.prototype.get attached): Added.
+
+        * UserInterface/Views/ContextMenuUtilities.js:
+        (WI.appendContextMenuItemsForDOMNode):
+        * UserInterface/Views/DOMTreeElement.js:
+        (WI.DOMTreeElement.prototype._populateTagContextMenu):
+
 2019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/DOMNode.js

@@ -192 +192 @@
             this._frame = WI.networkManager.frameForIdentifier(this.frameIdentifier);
         return this._frame;
+    }
+
+    get attached()
+    {
+        for (let node = this; node; node = node.parentNode) {
+            if (node.ownerDocument === node)
+                return true;
+        }
+        return false;
     }
 

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

@@ -157 +157 @@
 
     let isElement = domNode.nodeType() === Node.ELEMENT_NODE;
-    if (domNode.ownerDocument && isElement) {
+    let attached = domNode.attached;
+
+    if (isElement && attached) {
         copySubMenu.appendItem(WI.UIString("Selector Path"), () => {
             let cssPath = WI.cssPath(domNode);
@@ -164 +166 @@
     }
 
-    if (domNode.ownerDocument && !domNode.isPseudoElement()) {
+    if (!domNode.isPseudoElement() && attached) {
         copySubMenu.appendItem(WI.UIString("XPath"), () => {
             let xpath = WI.xpath(domNode);
@@ -206 +208 @@
     }
 
-    if (WI.domDebuggerManager.supported && isElement && !domNode.isPseudoElement() && domNode.ownerDocument) {
+    if (WI.domDebuggerManager.supported && isElement && !domNode.isPseudoElement() && attached) {
         contextMenu.appendSeparator();
 
@@ -225 +227 @@
     }
 
-    if (!options.excludeRevealElement && window.DOMAgent && domNode.ownerDocument) {
+    if (!options.excludeRevealElement && window.DOMAgent && attached) {
         contextMenu.appendItem(WI.UIString("Reveal in DOM Tree"), () => {
             WI.domManager.inspectElement(domNode.id);
@@ -231 +233 @@
     }
 
-    if (!options.excludeRevealLayer && window.LayerTreeAgent && domNode.parentNode) {
+    if (!options.excludeRevealLayer && window.LayerTreeAgent && attached) {
         contextMenu.appendItem(WI.UIString("Reveal in Layers Tab"), () => {
             WI.showLayersTab({nodeToSelect: domNode});
@@ -237 +239 @@
     }
 
-    if (window.PageAgent) {
+    if (window.PageAgent && attached) {
         contextMenu.appendItem(WI.UIString("Capture Screenshot"), () => {
             PageAgent.snapshotNode(domNode.id, (error, dataURL) => {
@@ -260 +262 @@
     }
 
-    if (isElement) {
+    if (isElement && attached) {
         contextMenu.appendItem(WI.UIString("Scroll Into View"), () => {
             domNode.scrollIntoView();

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

@@ -728 +728 @@
         let node = this.representedObject;
         let isNonShadowEditable = !node.isInUserAgentShadowTree() && this.editable;
+        let attached = node.attached;
 
         if (event.target && event.target.tagName === "A") {
@@ -761 +762 @@
         }
 
-        let attributeValue = this.representedObject.getAttribute(attributeName);
+        let attributeValue = node.getAttribute(attributeName);
         subMenus.copy.appendItem(WI.UIString("Attribute"), () => {
             let text = attributeName;
@@ -770 +771 @@
 
         subMenus.delete.appendItem(WI.UIString("Attribute"), () => {
-            this.representedObject.removeAttribute(attributeName);
+            node.removeAttribute(attributeName);
         }, !attribute || !isNonShadowEditable);
 
@@ -779 +780 @@
         contextMenu.appendSeparator();
 
-        if (WI.cssManager.canForcePseudoClasses()) {
+        if (WI.cssManager.canForcePseudoClasses() && attached) {
             let pseudoSubMenu = contextMenu.appendSubMenuItem(WI.UIString("Forced Pseudo-Classes"));
 
-            let enabledPseudoClasses = this.representedObject.enabledPseudoClasses;
+            let enabledPseudoClasses = node.enabledPseudoClasses;
             WI.CSSManager.ForceablePseudoClasses.forEach((pseudoClass) => {
                 let enabled = enabledPseudoClasses.includes(pseudoClass);
                 pseudoSubMenu.appendCheckboxItem(pseudoClass.capitalize(), () => {
-                    this.representedObject.setPseudoClassEnabled(pseudoClass, !enabled);
+                    node.setPseudoClassEnabled(pseudoClass, !enabled);
                 }, enabled);
             });