Attachment 373342 Details for Bug 199413 – Patch

[patch] Patch

bug-199413-20190702113559.patch (text/plain), 3.38 KB, created by Matt Baker on 2019-07-02 11:36:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Baker

Created: 2019-07-02 11:36:00 PDT

Size: 3.38 KB

patch

obsolete

>Subversion Revision: 247058
>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index c4f19a78df7c68922f7e01d7b0810c1a46fb3759..58fba9e6b67021cb3abc266900e5fa0c8b26c723 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-07-02  Matt Baker  <mattbaker@apple.com>
>+
>+        Web Inspector: Elements: DOM breakpoints context menu items inserted first when accessed via status image
>+        https://bugs.webkit.org/show_bug.cgi?id=199413
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Context menu handling should be done at the DOMTreeElement level.
>+
>+        * UserInterface/Views/ContextMenuUtilities.js:
>+        * UserInterface/Views/DOMTreeElement.js:
>+        (WI.DOMTreeElement.prototype._updateBreakpointStatus):
>+        (WI.DOMTreeElement.prototype._statusImageContextmenu): Deleted.
>+
> 2019-07-02  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Elements: allow nodes to be copied and pasted
>diff --git a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>index 5c27e2bef517a3f985ed2224d59d48a1b14ab1f5..e3293a9a038b8085cbca9bca6930ca843e4ef276 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/ContextMenuUtilities.js
>@@ -286,11 +286,6 @@ WI.appendContextMenuItemsForDOMNode = function(contextMenu, domNode, options = {
> 
> WI.appendContextMenuItemsForDOMNodeBreakpoints = function(contextMenu, domNode, options = {})
> {
>-    if (contextMenu.__domBreakpointItemsAdded)
>-        return;
>-
>-    contextMenu.__domBreakpointItemsAdded = true;
>-
>     let breakpoints = WI.domDebuggerManager.domBreakpointsForNode(domNode);
> 
>     contextMenu.appendSeparator();
>diff --git a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>index 5f20a68f30ec2393cdac98f499e4fe4e67f0cf67..834cb2704482520ffcbfd38c2968e449596e471d 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/DOMTreeElement.js
>@@ -1912,7 +1912,6 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement
>             this._statusImageElement = WI.ImageUtilities.useSVGSymbol("Images/DOMBreakpoint.svg", "status-image");
>             this._statusImageElement.classList.add("breakpoint");
>             this._statusImageElement.addEventListener("click", this._statusImageClicked.bind(this));
>-            this._statusImageElement.addEventListener("contextmenu", this._statusImageContextmenu.bind(this));
>             this._statusImageElement.addEventListener("mousedown", (event) => { event.stopPropagation(); });
>         }
> 
>@@ -1940,18 +1939,6 @@ WI.DOMTreeElement = class DOMTreeElement extends WI.TreeElement
>         breakpoints.forEach((breakpoint) => breakpoint.disabled = !shouldEnable);
>     }
> 
>-    _statusImageContextmenu(event)
>-    {
>-        if (!this.hasBreakpoint)
>-            return;
>-
>-        let contextMenu = WI.ContextMenu.createFromEvent(event);
>-
>-        WI.appendContextMenuItemsForDOMNodeBreakpoints(contextMenu, this.representedObject, {
>-            revealDescendantBreakpointsMenuItemHandler: this.bindRevealDescendantBreakpointsMenuItemHandler(),
>-        });
>-    }
>-
>     _highlightAnimationEnd()
>     {
>         let listItemElement = this.listItemElement;

Flags:

hi: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 199413: 373342