Title: [98333] trunk/Source/WebCore
- Revision
- 98333
- Author
- ca...@chromium.org
- Date
- 2011-10-25 05:59:07 -0700 (Tue, 25 Oct 2011)
Log Message
Web Inspector: JS exception in _javascript_SourceFrame.onShowPopover/showObjectPopover()
https://bugs.webkit.org/show_bug.cgi?id=70812
Reviewed by Pavel Feldman.
Check if highlighted element is present while displaying object popover.
* inspector/front-end/_javascript_SourceFrame.js:
(WebInspector._javascript_SourceFrame.prototype.onShowPopover.showObjectPopover):
(WebInspector._javascript_SourceFrame.prototype.onShowPopover):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (98332 => 98333)
--- trunk/Source/WebCore/ChangeLog 2011-10-25 11:01:51 UTC (rev 98332)
+++ trunk/Source/WebCore/ChangeLog 2011-10-25 12:59:07 UTC (rev 98333)
@@ -1,3 +1,16 @@
+2011-10-25 Andrey Kosyakov <ca...@chromium.org>
+
+ Web Inspector: JS exception in _javascript_SourceFrame.onShowPopover/showObjectPopover()
+ https://bugs.webkit.org/show_bug.cgi?id=70812
+
+ Reviewed by Pavel Feldman.
+
+ Check if highlighted element is present while displaying object popover.
+
+ * inspector/front-end/_javascript_SourceFrame.js:
+ (WebInspector._javascript_SourceFrame.prototype.onShowPopover.showObjectPopover):
+ (WebInspector._javascript_SourceFrame.prototype.onShowPopover):
+
2011-10-21 Nat Duca <nd...@chromium.org>
[chromium] Route Console::time and Console::timeEnd to trace_event
Modified: trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js (98332 => 98333)
--- trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2011-10-25 11:01:51 UTC (rev 98332)
+++ trunk/Source/WebCore/inspector/front-end/_javascript_SourceFrame.js 2011-10-25 12:59:07 UTC (rev 98333)
@@ -77,7 +77,9 @@
return;
}
showCallback(WebInspector.RemoteObject.fromPayload(result), wasThrown);
- this._highlightElement.addStyleClass("source-frame-eval-_expression_");
+ // Popover may have been removed by showCallback().
+ if (this._highlightElement)
+ this._highlightElement.addStyleClass("source-frame-eval-_expression_");
}
var selectedCallFrame = this._model.selectedCallFrame;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
