Changeset 90641 in webkit

Timestamp:

Jul 8, 2011 10:24:51 AM (13 years ago)

Author:

Nate Chapin

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):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebFrameImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-07-08  Nate Chapin  <japhet@chromium.org>
+
+        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  <vsevik@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -967 +967 @@
 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