Title: [115811] trunk/Source/WebCore
- Revision
- 115811
- Author
- [email protected]
- Date
- 2012-05-02 03:43:10 -0700 (Wed, 02 May 2012)
Log Message
Web Inspector: exception in console when there are watch expressions
https://bugs.webkit.org/show_bug.cgi?id=85351
Check if script execution is still paused before trying to resolve an
object for script popover because execution may be resumed after popover
showing is scheduled but before we start resolving the object under
the cursor in which case there is no selected call frame any more and
we should hide the popover.
Reviewed by Pavel Feldman.
* inspector/front-end/_javascript_SourceFrame.js:
(WebInspector._javascript_SourceFrame.prototype._resolveObjectForPopover):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115810 => 115811)
--- trunk/Source/WebCore/ChangeLog 2012-05-02 10:31:53 UTC (rev 115810)
+++ trunk/Source/WebCore/ChangeLog 2012-05-02 10:43:10 UTC (rev 115811)
@@ -1,3 +1,19 @@
+2012-05-02 Yury Semikhatsky <[email protected]>
+
+ Web Inspector: exception in console when there are watch expressions
+ https://bugs.webkit.org/show_bug.cgi?id=85351
+
+ Check if script execution is still paused before trying to resolve an
+ object for script popover because execution may be resumed after popover
+ showing is scheduled but before we start resolving the object under
+ the cursor in which case there is no selected call frame any more and
+ we should hide the popover.
+
+ Reviewed by Pavel Feldman.
+
+ * inspector/front-end/_javascript_SourceFrame.js:
+ (WebInspector._javascript_SourceFrame.prototype._resolveObjectForPopover):
+
2012-05-02 Tommy Widenflycht <[email protected]>
MediaStream API: Changing webkitGetUserMedia to take an object instead of a string
Modified: trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (115810 => 115811)
--- trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-05-02 10:31:53 UTC (rev 115810)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2012-05-02 10:43:10 UTC (rev 115811)
@@ -279,6 +279,10 @@
this._highlightElement.addStyleClass("source-frame-eval-_expression_");
}
+ if (!WebInspector.debuggerModel.isPaused()) {
+ this._popoverHelper.hidePopover();
+ return;
+ }
var selectedCallFrame = WebInspector.debuggerModel.selectedCallFrame();
selectedCallFrame.evaluate(this._highlightElement.textContent, objectGroupName, false, true, false, showObjectPopover.bind(this));
},
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
