Changeset 268626 in webkit

Timestamp:

Oct 16, 2020 6:50:57 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r266480): line-based JavaScript breakpoint tree element titles also show the file name
​https://bugs.webkit.org/show_bug.cgi?id=217859

Reviewed by Timothy Hatcher.

r266480 changed it such that WI.BreakpointTreeElement would only call updateTitles if
the constructor was not provided a title while also adding a fallback for title in the
constructor of WI.JavaScriptBreakpointTreeElement, ensuring that it would always be set
by the time it reached WI.BreakpointTreeElement, meaning that updateTitles would never
be called.

Since updateTitles was only implemented by WI.JavaScriptBreakpointTreeElement, remove
it from WI.BreakpointTreeElement and ensure that it is always called for non-special
JavaScript breakpoints (in addition to whenever the WI.SourceCodeLocation changes).

• UserInterface/Views/BreakpointTreeElement.js:

(WI.BreakpointTreeElement.prototype.updateTitles): Deleted.

• UserInterface/Views/JavaScriptBreakpointTreeElement.js:

(WI.JavaScriptBreakpointTreeElement):
(WI.JavaScriptBreakpointTreeElement.prototype._updateTitles): Added.
(WI.JavaScriptBreakpointTreeElement.prototype._breakpointLocationDidChange):
(WI.JavaScriptBreakpointTreeElement.prototype.updateTitles): Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/BreakpointTreeElement.js (modified) (2 diffs)
• UserInterface/Views/JavaScriptBreakpointTreeElement.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-10-16  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r266480): line-based JavaScript breakpoint tree element titles also show the file name
+        https://bugs.webkit.org/show_bug.cgi?id=217859
+
+        Reviewed by Timothy Hatcher.
+
+        r266480 changed it such that `WI.BreakpointTreeElement` would only call `updateTitles` if
+        the constructor was not provided a `title` while also adding a fallback for `title` in the
+        constructor of `WI.JavaScriptBreakpointTreeElement`, ensuring that it would always be set
+        by the time it reached `WI.BreakpointTreeElement`, meaning that `updateTitles` would never
+        be called.
+
+        Since `updateTitles` was only implemented by `WI.JavaScriptBreakpointTreeElement`, remove
+        it from `WI.BreakpointTreeElement` and ensure that it is always called for non-special
+        JavaScript breakpoints (in addition to whenever the `WI.SourceCodeLocation` changes).
+
+        * UserInterface/Views/BreakpointTreeElement.js:
+        (WI.BreakpointTreeElement.prototype.updateTitles): Deleted.
+        * UserInterface/Views/JavaScriptBreakpointTreeElement.js:
+        (WI.JavaScriptBreakpointTreeElement):
+        (WI.JavaScriptBreakpointTreeElement.prototype._updateTitles): Added.
+        (WI.JavaScriptBreakpointTreeElement.prototype._breakpointLocationDidChange):
+        (WI.JavaScriptBreakpointTreeElement.prototype.updateTitles): Deleted.
+
 2020-10-14  Devin Rousso  <drousso@apple.com>
 

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

@@ -55 +55 @@
         this._listenerSet.register(this.status, "click", this._statusImageElementClicked);
 
-        if (!title)
-            this.updateTitles();
         this.updateStatus();
 
@@ -144 +142 @@
         if (this._breakpoint.editable)
             this.status.classList.toggle(WI.BreakpointTreeElement.StatusImageAutoContinueStyleClassName, this._breakpoint.autoContinue);
-    }
-
-    updateTitles()
-    {
-        // Overridden by subclasses if needed.
     }
 

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

@@ -34 +34 @@
         classNames.push("javascript");
 
-        if (!title)
+        if (!title && breakpoint.special)
             title = breakpoint.displayName;
 
         super(breakpoint, {classNames, title});
 
-        if (!breakpoint.special)
+        if (!breakpoint.special) {
             this.listenerSet.register(breakpoint, WI.JavaScriptBreakpoint.Event.LocationDidChange, this._breakpointLocationDidChange);
+            this._updateTitles();
+        }
         this.listenerSet.register(breakpoint, WI.JavaScriptBreakpoint.Event.ResolvedStateDidChange, this.updateStatus);
     }
@@ -63 +65 @@
     }
 
-    updateTitles()
+    // Private
+
+    _updateTitles()
     {
-        super.updateTitles();
-
         console.assert(!this.breakpoint.special);
 
@@ -90 +92 @@
     }
 
-    // Private
-
     _breakpointLocationDidChange(event)
     {
@@ -100 +100 @@
             return;
 
-        this.updateTitles();
+        this._updateTitles();
     }
 };