Changeset 243715 in webkit

Timestamp:

Apr 1, 2019, 2:50:02 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Debugger: breakpoints don't populate in inspector2 on first load
​https://bugs.webkit.org/show_bug.cgi?id=196063
<rdar://problem/49097787>

Reviewed by Joseph Pecoraro.

In the case that a breakpoint becomes resolved after the resource has finished loaded, there
won't be an already existing TreeElement for the breakpoint to replace.

This can realistically only happen if the IndexedDB lookup is super slow, or the resource is
extremely fast (e.g. a data url).

• UserInterface/Views/DebuggerSidebarPanel.js:

(WI.DebuggerSidebarPanel.prototype._handleDebuggerObjectDisplayLocationDidChange):
(WI.DebuggerSidebarPanel.prototype._addDebuggerObject): Deleted.

• UserInterface/Views/SourcesNavigationSidebarPanel.js:

(WI.SourcesNavigationSidebarPanel.prototype._addBreakpoint):
(WI.SourcesNavigationSidebarPanel.prototype._addBreakpointsForSourceCode):
(WI.SourcesNavigationSidebarPanel.prototype._handleDebuggerObjectDisplayLocationDidChange):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/DebuggerSidebarPanel.js (modified) (2 diffs)
• UserInterface/Views/SourcesNavigationSidebarPanel.js (modified) (6 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-01  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Debugger: breakpoints don't populate in inspector2 on first load
+        https://bugs.webkit.org/show_bug.cgi?id=196063
+        <rdar://problem/49097787>
+
+        Reviewed by Joseph Pecoraro.
+
+        In the case that a breakpoint becomes resolved after the resource has finished loaded, there
+        won't be an already existing `TreeElement` for the breakpoint to replace.
+
+        This can realistically only happen if the IndexedDB lookup is super slow, or the resource is
+        extremely fast (e.g. a `data` url).
+
+        * UserInterface/Views/DebuggerSidebarPanel.js:
+        (WI.DebuggerSidebarPanel.prototype._handleDebuggerObjectDisplayLocationDidChange):
+        (WI.DebuggerSidebarPanel.prototype._addDebuggerObject): Deleted.
+
+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+        (WI.SourcesNavigationSidebarPanel.prototype._addBreakpoint):
+        (WI.SourcesNavigationSidebarPanel.prototype._addBreakpointsForSourceCode):
+        (WI.SourcesNavigationSidebarPanel.prototype._handleDebuggerObjectDisplayLocationDidChange):
+
 2019-04-01  Joseph Pecoraro  <pecoraro@apple.com>
 

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

@@ -823 +823 @@
             return;
 
-        var debuggerTreeElement = this._breakpointsContentTreeOutline.getCachedTreeElement(debuggerObject);
-        if (!debuggerTreeElement)
-            return;
-
-        // A known debugger object (breakpoint, issueMessage, etc.) moved between resources, remove the old tree element
-        // and create a new tree element with the updated file.
-
-        var wasSelected = debuggerTreeElement.selected;
-
-        this._removeDebuggerTreeElement(debuggerTreeElement);
-        var newDebuggerTreeElement = this._addDebuggerObject(debuggerObject);
-
-        if (newDebuggerTreeElement && wasSelected)
+        // A known debugger object (breakpoint, issueMessage, etc.) moved between resources. Remove
+        // the old tree element and create a new tree element with the updated file.
+
+        let wasSelected = false;
+        let oldDebuggerTreeElement = this._breakpointsContentTreeOutline.getCachedTreeElement(debuggerObject);
+        if (oldDebuggerTreeElement)
+            wasSelected = oldDebuggerTreeElement.selected;
+
+        let newDebuggerTreeElement = null;
+        if (debuggerObject instanceof WI.Breakpoint)
+            newDebuggerTreeElement = this._addBreakpoint(debuggerObject);
+        else if (debuggerObject instanceof WI.IssueMessage)
+            newDebuggerTreeElement = this._addIssue(debuggerObject);
+        if (!newDebuggerTreeElement)
+            return;
+
+        if (oldDebuggerTreeElement)
+            this._removeDebuggerTreeElement(oldDebuggerTreeElement);
+
+        if (wasSelected)
             newDebuggerTreeElement.revealAndSelect(true, false, true);
     }
@@ -1370 +1377 @@
     }
 
-    _addDebuggerObject(debuggerObject)
-    {
-        if (debuggerObject instanceof WI.Breakpoint)
-            return this._addBreakpoint(debuggerObject);
-
-        if (debuggerObject instanceof WI.IssueMessage)
-            return this._addIssue(debuggerObject);
-
-        return null;
-    }
-
     _addIssue(issueMessage)
     {

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

@@ -864 +864 @@
     _addBreakpoint(breakpoint)
     {
+        if (this._breakpointsTreeOutline.findTreeElement(breakpoint))
+            return null;
+
         let constructor = WI.BreakpointTreeElement;
         let options = {};
@@ -876 +879 @@
             if (!domNodeTreeElement) {
                 domNodeTreeElement = new WI.DOMNodeTreeElement(domNode);
-                this._insertDebuggerTreeElement(domNodeTreeElement, parentTreeElement);
+                this._insertDebuggerTreeElement(domNodeTreeElement, this._breakpointsTreeOutline);
             }
             return domNodeTreeElement;
@@ -911 +914 @@
                         const subtitle = null;
                         eventTargetTreeElement = new WI.GeneralTreeElement(["event-target-window"], WI.unlocalizedString("window"), subtitle, SourcesNavigationSidebarPanel.__windowEventTargetRepresentedObject);
-                        this._insertDebuggerTreeElement(eventTargetTreeElement, parentTreeElement);
+                        this._insertDebuggerTreeElement(eventTargetTreeElement, this._breakpointsTreeOutline);
                     }
                 } else if (breakpoint.eventListener.node)
@@ -928 +931 @@
             let sourceCode = breakpoint.sourceCodeLocation && breakpoint.sourceCodeLocation.displaySourceCode;
             if (!sourceCode)
-                return null;
-
-            if (this._breakpointsTreeOutline.findTreeElement(breakpoint))
                 return null;
 
@@ -1033 +1033 @@
     {
         for (let breakpoint of WI.debuggerManager.breakpointsForSourceCode(sourceCode))
-            this._addBreakpoint(breakpoint, sourceCode);
+            this._addBreakpoint(breakpoint);
     }
 
@@ -1762 +1762 @@
         if (debuggerObject instanceof WI.Breakpoint) {
             oldDebuggerTreeElement = this._breakpointsTreeOutline.findTreeElement(debuggerObject);
-            if (oldDebuggerTreeElement) {
-                newDebuggerTreeElement = this._addBreakpoint(debuggerObject);
+            if (oldDebuggerTreeElement)
                 wasSelected = oldDebuggerTreeElement.selected;
-            }
+
+            newDebuggerTreeElement = this._addBreakpoint(debuggerObject);
         } else if (debuggerObject instanceof WI.IssueMessage) {
             oldDebuggerTreeElement = this._resourcesTreeOutline.findTreeElement(debuggerObject);
-            if (oldDebuggerTreeElement) {
-                newDebuggerTreeElement = this._addIssue(debuggerObject);
+            if (oldDebuggerTreeElement)
                 wasSelected = oldDebuggerTreeElement.selected;
-            }
-        }
+
+            newDebuggerTreeElement = this._addIssue(debuggerObject);
+        }
+
+        if (!newDebuggerTreeElement)
+            return;
 
         if (oldDebuggerTreeElement)
             this._removeDebuggerTreeElement(oldDebuggerTreeElement);
 
-        if (newDebuggerTreeElement && wasSelected)
+        if (wasSelected)
             newDebuggerTreeElement.revealAndSelect(true, false, true);
     }