Title: [242765] trunk/Source/WebInspectorUI
- Revision
- 242765
- Author
- [email protected]
- Date
- 2019-03-11 19:54:07 -0700 (Mon, 11 Mar 2019)
Log Message
Web Inspector: DOMDebugger: protocol error on first open
https://bugs.webkit.org/show_bug.cgi?id=195248
<rdar://problem/48538465>
Unreviewed followup of r242743 to fix test inspector/dom-debugger/dom-breakpoints.html.
* UserInterface/Controllers/DOMDebuggerManager.js:
(WI.DOMDebuggerManager.prototype.addDOMBreakpoint):
(WI.DOMDebuggerManager.prototype._resolveDOMBreakpoint):
Still attempt to resolve the DOM breakpoint if it already has a `domNodeIdentifier` so that
it will get added to the node's frame's DOM breakpoint map. Without this, some breakpoints
might get "missed" when calling `WI.domDebuggerManager.removeDOMBreakpointsForNode`.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (242764 => 242765)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-03-12 02:16:41 UTC (rev 242764)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-03-12 02:54:07 UTC (rev 242765)
@@ -1,3 +1,18 @@
+2019-03-11 Devin Rousso <[email protected]>
+
+ Web Inspector: DOMDebugger: protocol error on first open
+ https://bugs.webkit.org/show_bug.cgi?id=195248
+ <rdar://problem/48538465>
+
+ Unreviewed followup of r242743 to fix test inspector/dom-debugger/dom-breakpoints.html.
+
+ * UserInterface/Controllers/DOMDebuggerManager.js:
+ (WI.DOMDebuggerManager.prototype.addDOMBreakpoint):
+ (WI.DOMDebuggerManager.prototype._resolveDOMBreakpoint):
+ Still attempt to resolve the DOM breakpoint if it already has a `domNodeIdentifier` so that
+ it will get added to the node's frame's DOM breakpoint map. Without this, some breakpoints
+ might get "missed" when calling `WI.domDebuggerManager.removeDOMBreakpointsForNode`.
+
2019-03-11 Justin Fan <[email protected]>
[Web GPU] Update GPUSwapChainDescriptor, GPUSwapChain and implement GPUCanvasContext
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js (242764 => 242765)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js 2019-03-12 02:16:41 UTC (rev 242764)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMDebuggerManager.js 2019-03-12 02:54:07 UTC (rev 242765)
@@ -175,11 +175,8 @@
this._domBreakpointURLMap.add(breakpoint.url, breakpoint);
- if (!breakpoint.disabled) {
- let target = WI.assumingMainTarget();
- if (target && target.DOMDebuggerAgent)
- this._updateDOMBreakpoint(breakpoint, target);
- }
+ if (breakpoint.domNodeIdentifier)
+ this._resolveDOMBreakpoint(breakpoint, breakpoint.domNodeIdentifier);
this.dispatchEventToListeners(WI.DOMDebuggerManager.Event.DOMBreakpointAdded, {breakpoint});
@@ -456,10 +453,12 @@
breakpoint.domNodeIdentifier = nodeIdentifier;
- // We should get the target associated with the nodeIdentifier of this breakpoint.
- let target = WI.assumingMainTarget();
- if (target && target.DOMDebuggerAgent)
- this._updateDOMBreakpoint(breakpoint, target);
+ if (!breakpoint.disabled) {
+ // We should get the target associated with the nodeIdentifier of this breakpoint.
+ let target = WI.assumingMainTarget();
+ if (target && target.DOMDebuggerAgent)
+ this._updateDOMBreakpoint(breakpoint, target);
+ }
}
_updateDOMBreakpoint(breakpoint, target)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
