Title: [269008] branches/safari-611.1.4-branch/Source/WebInspectorUI
Revision
269008
Author
[email protected]
Date
2020-10-26 18:13:00 -0700 (Mon, 26 Oct 2020)

Log Message

Cherry-pick r268786. rdar://problem/70702339

    Web Inspector: REGRESSION(r266074): Uncaught Exception: undefined is not an object (evaluating 'this._allListenersBreakpoint.disabled')
    https://bugs.webkit.org/show_bug.cgi?id=217992

    Reviewed by Joseph Pecoraro.

    r266074 changed it such that `_allListenersBreakpoint` doesn't always exist, so check that
    it exists before getting a property from it.

    * UserInterface/Controllers/DOMDebuggerManager.js:
    (WI.DOMDebuggerManager.prototype.listenerBreakpointForEventName):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268786 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611.1.4-branch/Source/WebInspectorUI/ChangeLog (269007 => 269008)


--- branches/safari-611.1.4-branch/Source/WebInspectorUI/ChangeLog	2020-10-27 01:12:58 UTC (rev 269007)
+++ branches/safari-611.1.4-branch/Source/WebInspectorUI/ChangeLog	2020-10-27 01:13:00 UTC (rev 269008)
@@ -1,3 +1,34 @@
+2020-10-26  Alan Coon  <[email protected]>
+
+        Cherry-pick r268786. rdar://problem/70702339
+
+    Web Inspector: REGRESSION(r266074): Uncaught Exception: undefined is not an object (evaluating 'this._allListenersBreakpoint.disabled')
+    https://bugs.webkit.org/show_bug.cgi?id=217992
+    
+    Reviewed by Joseph Pecoraro.
+    
+    r266074 changed it such that `_allListenersBreakpoint` doesn't always exist, so check that
+    it exists before getting a property from it.
+    
+    * UserInterface/Controllers/DOMDebuggerManager.js:
+    (WI.DOMDebuggerManager.prototype.listenerBreakpointForEventName):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268786 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-10-20  Devin Rousso  <[email protected]>
+
+            Web Inspector: REGRESSION(r266074): Uncaught Exception: undefined is not an object (evaluating 'this._allListenersBreakpoint.disabled')
+            https://bugs.webkit.org/show_bug.cgi?id=217992
+
+            Reviewed by Joseph Pecoraro.
+
+            r266074 changed it such that `_allListenersBreakpoint` doesn't always exist, so check that
+            it exists before getting a property from it.
+
+            * UserInterface/Controllers/DOMDebuggerManager.js:
+            (WI.DOMDebuggerManager.prototype.listenerBreakpointForEventName):
+
 2020-10-16  Devin Rousso  <[email protected]>
 
         Web Inspector: REGRESSION(r266669): DOMBreakpoint.js:106:23: CONSOLE ASSERT ERROR domNode should not change once set

Modified: branches/safari-611.1.4-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js (269007 => 269008)


--- branches/safari-611.1.4-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js	2020-10-27 01:12:58 UTC (rev 269007)
+++ branches/safari-611.1.4-branch/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js	2020-10-27 01:13:00 UTC (rev 269008)
@@ -354,7 +354,7 @@
 
     listenerBreakpointForEventName(eventName)
     {
-        if (DOMDebuggerManager.supportsAllListenersBreakpoint() && !this._allListenersBreakpoint.disabled)
+        if (DOMDebuggerManager.supportsAllListenersBreakpoint() && this._allListenersBreakpoint && !this._allListenersBreakpoint.disabled)
             return this._allListenersBreakpoint;
         return this._listenerBreakpoints.find((breakpoint) => breakpoint.eventName === eventName) || null;
     }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to