Attachment 372592 Details for Bug 199033 – Patch

[patch] Patch

bug-199033-20190620152058.patch (text/plain), 4.30 KB, created by Devin Rousso on 2019-06-20 15:20:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-20 15:20:59 PDT

Size: 4.30 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 8f5c739891d81a1459c80f335ddda9e4221840c0..ce922c2381f531d1f2b6f3b00347544bc290caa5 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,26 @@
>+2019-06-19  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Debugger: setting a breakpoint on a non-JavaScript line should immediately show as unresolved
>+        https://bugs.webkit.org/show_bug.cgi?id=199033
>+
>+        Reviewed by Matt Baker.
>+
>+        Remove the `shouldSpeculativelyResolve` parameter, as it was resolving breakpoints even in
>+        the case that there were no resolved locations for the given breakpoint.
>+
>+        In the case that there are resolved locations, the breakpoint would've already been resolved
>+        by the time that `shouldSpeculativelyResolve` would've taken effect, so it's unnecessary.
>+
>+        This parameter was only used when setting a breakpoint from a `SourceCodeTextEditor` gutter.
>+
>+        * UserInterface/Controllers/DebuggerManager.js:
>+        (WI.DebuggerManager.prototype.addBreakpoint):
>+        (WI.DebuggerManager.prototype._setBreakpoint):
>+        (WI.DebuggerManager.prototype._setBreakpoint.didSetBreakpoint):
>+
>+        * UserInterface/Views/SourceCodeTextEditor.js:
>+        (WI.SourceCodeTextEditor.prototype.textEditorBreakpointAdded):
>+
> 2019-06-19  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: REGRESSION: Debugger: current call frame indicator isn't vertically centered
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
>index 7aaeeb86849c9a3642363d9b208db9414b618567..4276799ac0857519acec60b77889d5df6011f73d 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js
>@@ -471,7 +471,7 @@ WI.DebuggerManager = class DebuggerManager extends WI.Object
>         return script.target.DebuggerAgent.continueToLocation({scriptId: script.id, lineNumber, columnNumber});
>     }
> 
>-    addBreakpoint(breakpoint, shouldSpeculativelyResolve)
>+    addBreakpoint(breakpoint)
>     {
>         console.assert(breakpoint instanceof WI.Breakpoint);
>         if (!breakpoint)
>@@ -492,10 +492,7 @@ WI.DebuggerManager = class DebuggerManager extends WI.Object
> 
>         if (!breakpoint.disabled) {
>             const specificTarget = undefined;
>-            this._setBreakpoint(breakpoint, specificTarget, () => {
>-                if (shouldSpeculativelyResolve)
>-                    breakpoint.resolved = true;
>-            });
>+            this._setBreakpoint(breakpoint, specificTarget);
>         }
> 
>         if (!this._restoringBreakpoints)
>@@ -933,7 +930,7 @@ WI.DebuggerManager = class DebuggerManager extends WI.Object
>         };
>     }
> 
>-    _setBreakpoint(breakpoint, specificTarget, callback)
>+    _setBreakpoint(breakpoint, specificTarget)
>     {
>         console.assert(!breakpoint.disabled);
> 
>@@ -962,9 +959,6 @@ WI.DebuggerManager = class DebuggerManager extends WI.Object
> 
>             for (let location of locations)
>                 this.breakpointResolved(target, breakpointIdentifier, location);
>-
>-            if (typeof callback === "function")
>-                callback();
>         }
> 
>         // The breakpoint will be resolved again by calling DebuggerAgent, so mark it as unresolved.
>diff --git a/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js b/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js
>index 8170b50a6e3509a6ffd76e924d91cfd92d657162..3df33b564493e0aa323d93d7951a20ec9ab1d5fe 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js
>@@ -1297,8 +1297,7 @@ WI.SourceCodeTextEditor = class SourceCodeTextEditor extends WI.TextEditor
>         this._addBreakpointWithEditorLineInfo(breakpoint, lineInfo);
> 
>         this._ignoreBreakpointAddedBreakpoint = breakpoint;
>-        const shouldSpeculativelyResolveBreakpoint = true;
>-        WI.debuggerManager.addBreakpoint(breakpoint, shouldSpeculativelyResolveBreakpoint);
>+        WI.debuggerManager.addBreakpoint(breakpoint);
>         this._ignoreBreakpointAddedBreakpoint = null;
> 
>         // Return the more accurate location and breakpoint info.

Actions: View | Formatted Diff | Diff

Attachments on bug 199033: 372497 | 372592