Changeset 207359 in webkit

Timestamp:

Oct 14, 2016 4:10:34 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Dragging to delete a Breakpoint should never trigger a ContentView change
​https://bugs.webkit.org/show_bug.cgi?id=163403
<rdar://problem/28762930>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-10-14
Reviewed by Timothy Hatcher.

• UserInterface/Views/BreakpointTreeElement.js:

(WebInspector.BreakpointTreeElement.prototype.ondelete):
Signal when a breakpoint tree element will be going away because it was
deleted via the keyboard operation within the TreeOutline. This is a dirty
way to do the signal but we remove BreakpointTreeElements asynchronously
when the Breakpoint actually gets removed from the backend.

• UserInterface/Views/DebuggerSidebarPanel.js:

(WebInspector.DebuggerSidebarPanel.prototype._removeDebuggerTreeElement):
Deselect a BreakpointTreeElement if it was deleted in a way other then
the delete keyboard shortcut. This ensures another TreeElement selection
doesn't force ContentView changes.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/BreakpointTreeElement.js (modified) (1 diff)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-10-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Dragging to delete a Breakpoint should never trigger a ContentView change
+        https://bugs.webkit.org/show_bug.cgi?id=163403
+        <rdar://problem/28762930>
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/BreakpointTreeElement.js:
+        (WebInspector.BreakpointTreeElement.prototype.ondelete):
+        Signal when a breakpoint tree element will be going away because it was
+        deleted via the keyboard operation within the TreeOutline. This is a dirty
+        way to do the signal but we remove BreakpointTreeElements asynchronously
+        when the Breakpoint actually gets removed from the backend.
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WebInspector.DebuggerSidebarPanel.prototype._removeDebuggerTreeElement):
+        Deselect a BreakpointTreeElement if it was deleted in a way other then
+        the delete keyboard shortcut. This ensures another TreeElement selection
+        doesn't force ContentView changes.
+
 2016-10-14  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -81 +81 @@
             return false;
 
+        // We set this flag so that TreeOutlines that will remove this
+        // BreakpointTreeElement will know whether it was deleted from
+        // within the TreeOutline or from outside it (e.g. TextEditor).
+        this.__deletedViaDeleteKeyboardShortcut = true;
+
         WebInspector.debuggerManager.removeBreakpoint(this._breakpoint);
         return true;

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

@@ -587 +587 @@
     _removeDebuggerTreeElement(debuggerTreeElement)
     {
-        var parentTreeElement = debuggerTreeElement.parent;
+        // If this is a BreakpointTreeElement being deleted because of a cause
+        // outside of the TreeOutline then deselect if it is selected to avoid
+        // TreeOutline selection changes causing unexpected ContentView changes.
+        if (!debuggerTreeElement.__deletedViaDeleteKeyboardShortcut)
+            debuggerTreeElement.deselect();
+
+        let parentTreeElement = debuggerTreeElement.parent;
         parentTreeElement.removeChild(debuggerTreeElement);