Attachment 372272 Details for Bug 198932 – Patch

[patch] Patch

bug-198932-20190617142421.patch (text/plain), 5.09 KB, created by Devin Rousso on 2019-06-17 14:24:22 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-17 14:24:22 PDT

Size: 5.09 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index 079cf01a7766fee345c357b9489642eb5f01ccba..5fe72b5c55d17eb86e54c537e274aece959b82ca 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-06-17  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Debugger: adding a DOM/Event/URL breakpoint should enable breakpoints
>+        https://bugs.webkit.org/show_bug.cgi?id=198932
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Controllers/DOMManager.js:
>+        (WI.DOMManager.prototype._updateEventBreakpoint):
>+
>+        * UserInterface/Controllers/DOMDebuggerManager.js:
>+        (WI.DOMDebuggerManager.prototype._updateDOMBreakpoint):
>+        (WI.DOMDebuggerManager.prototype._updateEventBreakpoint):
>+        (WI.DOMDebuggerManager.prototype._updateURLBreakpoint):
>+
> 2019-06-17  Devin Rousso  <drousso@apple.com>
> 
>         Web Inspector: Settings: split the General panel into sub panels so it's less crowded
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js
>index 09ab83bbf920fd78837ee4315970fdeb31808be6..69ce6d199e23a9554019edab4dbbea6f9792d319 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js
>@@ -492,8 +492,12 @@ WI.DOMDebuggerManager = class DOMDebuggerManager extends WI.Object
> 
>         if (breakpoint.disabled)
>             target.DOMDebuggerAgent.removeDOMBreakpoint(breakpoint.domNodeIdentifier, breakpoint.type);
>-        else
>+        else {
>+            if (!this._restoringBreakpoints && !WI.debuggerManager.breakpointsDisabledTemporarily)
>+                WI.debuggerManager.breakpointsEnabled = true;
>+
>             target.DOMDebuggerAgent.setDOMBreakpoint(breakpoint.domNodeIdentifier, breakpoint.type);
>+        }
>     }
> 
>     _updateEventBreakpoint(breakpoint, target)
>@@ -505,15 +509,23 @@ WI.DOMDebuggerManager = class DOMDebuggerManager extends WI.Object
>             console.assert(breakpoint.type === WI.EventBreakpoint.Type.Listener);
>             if (breakpoint.disabled)
>                 target.DOMDebuggerAgent.removeEventListenerBreakpoint(breakpoint.eventName);
>-            else
>+            else {
>+                if (!this._restoringBreakpoints && !WI.debuggerManager.breakpointsDisabledTemporarily)
>+                    WI.debuggerManager.breakpointsEnabled = true;
>+
>                 target.DOMDebuggerAgent.setEventListenerBreakpoint(breakpoint.eventName);
>+            }
>             return;
>         }
> 
>         if (breakpoint.disabled)
>             target.DOMDebuggerAgent.removeEventBreakpoint(breakpoint.type, breakpoint.eventName);
>-        else
>+        else {
>+            if (!this._restoringBreakpoints && !WI.debuggerManager.breakpointsDisabledTemporarily)
>+                WI.debuggerManager.breakpointsEnabled = true;
>+
>             target.DOMDebuggerAgent.setEventBreakpoint(breakpoint.type, breakpoint.eventName);
>+        }
>     }
> 
>     _updateURLBreakpoint(breakpoint, target)
>@@ -525,6 +537,9 @@ WI.DOMDebuggerManager = class DOMDebuggerManager extends WI.Object
>             if (breakpoint.disabled)
>                 target.DOMDebuggerAgent.removeXHRBreakpoint(breakpoint.url);
>             else {
>+                if (!this._restoringBreakpoints && !WI.debuggerManager.breakpointsDisabledTemporarily)
>+                    WI.debuggerManager.breakpointsEnabled = true;
>+
>                 let isRegex = breakpoint.type === WI.URLBreakpoint.Type.RegularExpression;
>                 target.DOMDebuggerAgent.setXHRBreakpoint(breakpoint.url, isRegex);
>             }
>@@ -534,6 +549,9 @@ WI.DOMDebuggerManager = class DOMDebuggerManager extends WI.Object
>         if (breakpoint.disabled)
>             target.DOMDebuggerAgent.removeURLBreakpoint(breakpoint.url);
>         else {
>+            if (!this._restoringBreakpoints && !WI.debuggerManager.breakpointsDisabledTemporarily)
>+                WI.debuggerManager.breakpointsEnabled = true;
>+
>             let isRegex = breakpoint.type === WI.URLBreakpoint.Type.RegularExpression;
>             target.DOMDebuggerAgent.setURLBreakpoint(breakpoint.url, isRegex);
>         }
>diff --git a/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js b/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js
>index 96a6a228813160a8db9572f102d2eac1203edfee..26a76120a808ba798587f7ad62491552195a297e 100644
>--- a/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js
>+++ b/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js
>@@ -674,8 +674,12 @@ WI.DOMManager = class DOMManager extends WI.Object
> 
>         if (breakpoint.disabled)
>             target.DOMAgent.removeBreakpointForEventListener(eventListener.eventListenerId);
>-        else
>+        else {
>+            if (!WI.debuggerManager.breakpointsDisabledTemporarily)
>+                WI.debuggerManager.breakpointsEnabled = true;
>+
>             target.DOMAgent.setBreakpointForEventListener(eventListener.eventListenerId);
>+        }
>     }
> 
>     _handleEventBreakpointDisabledStateChanged(event)

Actions: View | Formatted Diff | Diff

Attachments on bug 198932: 372272 | 372281