Changeset 248588 in webkit

Timestamp:

Aug 12, 2019 8:52:38 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r248201): DOMDebugger: unable to add event breakpoint when All Events breakpoint is enabled
​https://bugs.webkit.org/show_bug.cgi?id=200561

Reviewed by Joseph Pecoraro.

• UserInterface/Controllers/DOMDebuggerManager.js:

(WI.DOMDebuggerManager.prototype.addEventBreakpoint):
(WI.DOMDebuggerManager.prototype.removeEventBreakpoint):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/DOMDebuggerManager.js (modified) (4 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-08-12  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r248201): DOMDebugger: unable to add event breakpoint when All Events breakpoint is enabled
+        https://bugs.webkit.org/show_bug.cgi?id=200561
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Controllers/DOMDebuggerManager.js:
+        (WI.DOMDebuggerManager.prototype.addEventBreakpoint):
+        (WI.DOMDebuggerManager.prototype.removeEventBreakpoint):
+
 2019-08-12  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js

@@ -369 +369 @@
     addEventBreakpoint(breakpoint)
     {
-        console.assert(breakpoint instanceof WI.EventBreakpoint);
+        console.assert(breakpoint instanceof WI.EventBreakpoint, breakpoint);
         if (!breakpoint)
             return;
@@ -378 +378 @@
         }
 
-        console.assert(breakpoint.type === WI.EventBreakpoint.Type.Listener);
-
-        if (this.listenerBreakpointForEventName(breakpoint.eventName))
+        console.assert(breakpoint.type === WI.EventBreakpoint.Type.Listener, breakpoint);
+        console.assert(breakpoint.eventName, breakpoint);
+
+        if (this._listenerBreakpoints.find((existing) => existing.eventName === breakpoint.eventName))
             return;
 
@@ -398 +399 @@
     removeEventBreakpoint(breakpoint)
     {
-        console.assert(breakpoint instanceof WI.EventBreakpoint);
+        console.assert(breakpoint instanceof WI.EventBreakpoint, breakpoint);
         if (!breakpoint)
             return;
@@ -408 +409 @@
         }
 
-        console.assert(breakpoint.type === WI.EventBreakpoint.Type.Listener);
-
+        console.assert(breakpoint.type === WI.EventBreakpoint.Type.Listener, breakpoint);
+        console.assert(breakpoint.eventName, breakpoint);
+
+        console.assert(this._listenerBreakpoints.includes(breakpoint), breakpoint);
         if (!this._listenerBreakpoints.includes(breakpoint))
             return;