Changeset 109377 in webkit

Timestamp:

Mar 1, 2012, 11:26:02 AM (15 years ago)

Author:

cevans@google.com

Message:

Merge 107729
BUG=113562
Review URL: ​https://chromiumcodereview.appspot.com/9570024

Location:

branches/chromium/1025

Files:

• LayoutTests/http/tests/navigation/navigation-redirect-schedule-crash-expected.txt (copied) (copied from trunk/LayoutTests/http/tests/navigation/navigation-redirect-schedule-crash-expected.txt )
• LayoutTests/http/tests/navigation/navigation-redirect-schedule-crash.html (copied) (copied from trunk/LayoutTests/http/tests/navigation/navigation-redirect-schedule-crash.html )
• Source/WebCore/loader/NavigationScheduler.cpp (modified) (2 diffs)

branches/chromium/1025/Source/WebCore/loader/NavigationScheduler.cpp

@@ -423 +423 @@
     ASSERT(m_frame->page());
 
+    RefPtr<Frame> protect(m_frame);
+
     // If a redirect was scheduled during a load, then stop the current load.
     // Otherwise when the current load transitions from a provisional to a 
@@ -438 +440 @@
         m_frame->loader()->completed();
 
+    if (!m_frame->page())
+        return;
+
     startTimer();
 }