Title: [90641] trunk/Source/WebKit/chromium
- Revision
- 90641
- Author
- [email protected]
- Date
- 2011-07-08 10:24:51 -0700 (Fri, 08 Jul 2011)
Log Message
Check activeDocumentLoader() in
WebFrameImpl::currentHistoryItem() and return
early if null, since that should mean we're
shutting down.
https://bugs.webkit.org/show_bug.cgi?id=52923
Reviewed by Darin Fisher.
No known repro, so no new test.
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::currentHistoryItem):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (90640 => 90641)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-08 16:13:42 UTC (rev 90640)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-08 17:24:51 UTC (rev 90641)
@@ -1,3 +1,18 @@
+2011-07-08 Nate Chapin <[email protected]>
+
+ Check activeDocumentLoader() in
+ WebFrameImpl::currentHistoryItem() and return
+ early if null, since that should mean we're
+ shutting down.
+ https://bugs.webkit.org/show_bug.cgi?id=52923
+
+ Reviewed by Darin Fisher.
+
+ No known repro, so no new test.
+
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::currentHistoryItem):
+
2011-07-07 Vsevolod Vlasov <[email protected]>
Web Inspector: Add support for clearing cache and cookies from network panel.
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (90640 => 90641)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-07-08 16:13:42 UTC (rev 90640)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2011-07-08 17:24:51 UTC (rev 90641)
@@ -966,6 +966,10 @@
WebHistoryItem WebFrameImpl::currentHistoryItem() const
{
+ // We're shutting down.
+ if (!m_frame->loader()->activeDocumentLoader())
+ return WebHistoryItem();
+
// If we are still loading, then we don't want to clobber the current
// history item as this could cause us to lose the scroll position and
// document state. However, it is OK for new navigations.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
