Title: [238003] trunk/Source/WebInspectorUI
- Revision
- 238003
- Author
- [email protected]
- Date
- 2018-11-08 14:43:52 -0800 (Thu, 08 Nov 2018)
Log Message
Web Inspector: Debugger Popover does not work when paused in Worker
https://bugs.webkit.org/show_bug.cgi?id=191342
Patch by Joseph Pecoraro <[email protected]> on 2018-11-08
Reviewed by Devin Rousso.
* UserInterface/Views/SourceCodeTextEditor.js:
(WI.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedJavaScriptExpression.populate):
(WI.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedJavaScriptExpression):
When receiving the result of the popover evaluation associate the RemoteObject with
the target we used to evaluate (such as the Debugger call frame), not the target
associated with the editor.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (238002 => 238003)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-11-08 22:18:15 UTC (rev 238002)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-11-08 22:43:52 UTC (rev 238003)
@@ -1,5 +1,19 @@
2018-11-08 Joseph Pecoraro <[email protected]>
+ Web Inspector: Debugger Popover does not work when paused in Worker
+ https://bugs.webkit.org/show_bug.cgi?id=191342
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WI.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedJavaScriptExpression.populate):
+ (WI.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedJavaScriptExpression):
+ When receiving the result of the popover evaluation associate the RemoteObject with
+ the target we used to evaluate (such as the Debugger call frame), not the target
+ associated with the editor.
+
+2018-11-08 Joseph Pecoraro <[email protected]>
+
Web Inspector: Restrict domains at the target level instead of only at the window level
https://bugs.webkit.org/show_bug.cgi?id=191344
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (238002 => 238003)
--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2018-11-08 22:18:15 UTC (rev 238002)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2018-11-08 22:43:52 UTC (rev 238003)
@@ -1725,6 +1725,9 @@
{
console.assert(candidate._expression_);
+ let target = WI.debuggerManager.activeCallFrame ? WI.debuggerManager.activeCallFrame.target : this.target;
+ let _expression_ = appendWebInspectorSourceURL(candidate._expression_);
+
function populate(error, result, wasThrown)
{
if (error || wasThrown)
@@ -1733,7 +1736,7 @@
if (candidate !== this.tokenTrackingController.candidate)
return;
- let data = "" this.target);
+ let data = "" target);
switch (data.type) {
case "function":
this._showPopoverForFunction(data);
@@ -1754,8 +1757,6 @@
}
}
- let target = WI.debuggerManager.activeCallFrame ? WI.debuggerManager.activeCallFrame.target : this.target;
- let _expression_ = appendWebInspectorSourceURL(candidate._expression_);
if (WI.debuggerManager.activeCallFrame) {
target.DebuggerAgent.evaluateOnCallFrame.invoke({callFrameId: WI.debuggerManager.activeCallFrame.id, _expression_, objectGroup: "popover", doNotPauseOnExceptionsAndMuteConsole: true}, populate.bind(this), target.DebuggerAgent);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
