Merge 107729

Source/WebCore/loader/NavigationScheduler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2009 Adam Barth. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 404 matching lines @@
         return;
 
     OwnPtr<ScheduledNavigation> redirect(m_redirect.release());
     redirect->fire(m_frame);
 }
 
 void NavigationScheduler::schedule(PassOwnPtr<ScheduledNavigation> redirect)
 {
     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 
     // committed state, pending redirects may be cancelled. 
     if (redirect->wasDuringLoad()) {
         if (DocumentLoader* provisionalDocumentLoader = m_frame->loader()->provisionalDocumentLoader())
             provisionalDocumentLoader->stopLoading();
         m_frame->loader()->stopLoading(UnloadEventPolicyUnloadAndPageHide);   
     }
 
     cancel();
     m_redirect = redirect;
 
     if (!m_frame->loader()->isComplete() && m_redirect->isLocationChange())
         m_frame->loader()->completed();
 
+    if (!m_frame->page())
+        return;
+
     startTimer();
 }
 
 void NavigationScheduler::startTimer()
 {
     if (!m_redirect)
         return;
 
     ASSERT(m_frame->page());
     if (m_timer.isActive())
         return;
     if (!m_redirect->shouldStartTimer(m_frame))
         return;
 
     m_timer.startOneShot(m_redirect->delay());
     m_redirect->didStartTimer(m_frame, &m_timer);
 }
 
 void NavigationScheduler::cancel(bool newLoadInProgress)
 {
     m_timer.stop();
 
     OwnPtr<ScheduledNavigation> redirect(m_redirect.release());
     if (redirect)
         redirect->didStopTimer(m_frame, newLoadInProgress);
 }
 
 } // namespace WebCore