Changeset 252447 in webkit

Timestamp:

Nov 13, 2019, 7:36:53 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Uncaught Exception: Invalid type of argument 'eventName' for command 'DOMDebugger.setEventBreakpoint' call. It must be 'string' but it is 'object'.
​https://bugs.webkit.org/show_bug.cgi?id=204176

Reviewed by Timothy Hatcher.

• UserInterface/Views/EventBreakpointPopover.js:

(WI.EventBreakpointPopover.prototype.dismiss):
Only create the WI.EventBreakpoint if the <input> has a value.

• UserInterface/Controllers/DOMDebuggerManager.js:

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

• UserInterface/Views/SourcesNavigationSidebarPanel.js:

(WI.SourcesNavigationSidebarPanel.prototype._willDismissEventBreakpointPopover):
(WI.SourcesNavigationSidebarPanel.prototype._willDismissURLBreakpointPopover):
Drive-by: if the configuration isn't valid (e.g. no breakpoint) or the breakpoint already

exists, beep.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Controllers/DOMDebuggerManager.js (modified) (5 diffs)
• UserInterface/Views/EventBreakpointPopover.js (modified) (1 diff)
• UserInterface/Views/SourcesNavigationSidebarPanel.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-11-13  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Uncaught Exception: Invalid type of argument 'eventName' for command 'DOMDebugger.setEventBreakpoint' call. It must be 'string' but it is 'object'.
+        https://bugs.webkit.org/show_bug.cgi?id=204176
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/EventBreakpointPopover.js:
+        (WI.EventBreakpointPopover.prototype.dismiss):
+        Only create the `WI.EventBreakpoint` if the <input> has a value.
+
+        * UserInterface/Controllers/DOMDebuggerManager.js:
+        (WI.DOMDebuggerManager.prototype.addEventBreakpoint):
+        (WI.DOMDebuggerManager.prototype.addURLBreakpoint):
+        * UserInterface/Views/SourcesNavigationSidebarPanel.js:
+        (WI.SourcesNavigationSidebarPanel.prototype._willDismissEventBreakpointPopover):
+        (WI.SourcesNavigationSidebarPanel.prototype._willDismissURLBreakpointPopover):
+        Drive-by: if the configuration isn't valid (e.g. no breakpoint) or the breakpoint already
+                  exists, beep.
+
 2019-11-12  Devin Rousso  <drousso@apple.com>
 

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

@@ -379 +379 @@
         console.assert(breakpoint instanceof WI.EventBreakpoint, breakpoint);
         if (!breakpoint)
-            return;
+            return false;
 
         if (this.isBreakpointSpecial(breakpoint)) {
             this.dispatchEventToListeners(WI.DOMDebuggerManager.Event.EventBreakpointAdded, {breakpoint});
-            return;
+            return true;
         }
 
@@ -390 +390 @@
 
         if (this._listenerBreakpoints.find((existing) => existing.eventName === breakpoint.eventName))
-            return;
+            return false;
 
         this._listenerBreakpoints.push(breakpoint);
@@ -403 +403 @@
         if (!this._restoringBreakpoints)
             WI.objectStores.eventBreakpoints.putObject(breakpoint);
+
+        return true;
     }
 
@@ -454 +456 @@
         console.assert(breakpoint instanceof WI.URLBreakpoint);
         if (!breakpoint)
-            return;
+            return false;
 
         if (this.isBreakpointSpecial(breakpoint)) {
             this.dispatchEventToListeners(WI.DOMDebuggerManager.Event.URLBreakpointAdded, {breakpoint});
-            return;
+            return true;
         }
 
         console.assert(!this._urlBreakpoints.includes(breakpoint), "Already added URL breakpoint.", breakpoint);
         if (this._urlBreakpoints.includes(breakpoint))
-            return;
+            return false;
 
         if (this._urlBreakpoints.some((entry) => entry.type === breakpoint.type && entry.url === breakpoint.url))
-            return;
+            return false;
 
         this._urlBreakpoints.push(breakpoint);
@@ -479 +481 @@
         if (!this._restoringBreakpoints)
             WI.objectStores.urlBreakpoints.putObject(breakpoint);
+
+        return true;
     }
 

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

@@ -106 +106 @@
     dismiss()
     {
-        this._breakpoint = new WI.EventBreakpoint(WI.EventBreakpoint.Type.Listener, {eventName: this._domEventNameInputElement.value});
+        let eventName = this._domEventNameInputElement.value;
+        if (eventName)
+            this._breakpoint = new WI.EventBreakpoint(WI.EventBreakpoint.Type.Listener, {eventName});
+
+        this._suggestionsView.hide();
 
         super.dismiss();
-
-        this._suggestionsView.hide();
     }
 

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

@@ -692 +692 @@
     {
         let breakpoint = popover.breakpoint;
-        if (!breakpoint)
-            return;
-
-        WI.domDebuggerManager.addEventBreakpoint(breakpoint);
+        if (!breakpoint) {
+            InspectorFrontendHost.beep();
+            return;
+        }
+
+        if (!WI.domDebuggerManager.addEventBreakpoint(breakpoint))
+            InspectorFrontendHost.beep();
     }
 
@@ -701 +704 @@
     {
         let breakpoint = popover.breakpoint;
-        if (!breakpoint)
-            return;
-
-        WI.domDebuggerManager.addURLBreakpoint(breakpoint);
+        if (!breakpoint) {
+            InspectorFrontendHost.beep();
+            return;
+        }
+
+        if (!WI.domDebuggerManager.addURLBreakpoint(breakpoint))
+            InspectorFrontendHost.beep();
     }