Fix for interstitial reload bug

chrome/browser/tab_contents/interstitial_page.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/interstitial_page.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/thread.h"
 #include "chrome/browser/browser.h"
@@ skipping 88 matching lines @@
 // static
 InterstitialPage::InterstitialPageMap*
     InterstitialPage::tab_to_interstitial_page_ =  NULL;
 
 InterstitialPage::InterstitialPage(WebContents* tab,
                                    bool new_navigation,
                                    const GURL& url)
     : tab_(tab),
       url_(url),
       new_navigation_(new_navigation),
+      should_discard_pending_nav_entry_(new_navigation),
       enabled_(true),
       action_taken_(false),
       render_view_host_(NULL),
       original_rvh_process_id_(tab->render_view_host()->process()->pid()),
       original_rvh_id_(tab->render_view_host()->routing_id()),
       should_revert_tab_title_(false),
       resource_dispatcher_host_notified_(false),
       ui_loop_(MessageLoop::current()),
       ALLOW_THIS_IN_INITIALIZER_LIST(rvh_view_delegate_(
           new InterstitialPageRVHViewDelegate(this))) {
@@ skipping 12 matching lines @@
       "http://crbug.com/9442 with the URL you were visiting";
   if (iter != tab_to_interstitial_page_->end())
     tab_to_interstitial_page_->erase(iter);
   DCHECK(!render_view_host_);
 }
 
 void InterstitialPage::Show() {
   // If an interstitial is already showing, close it before showing the new one.
   // Be careful not to take an action on the old interstitial more than once.
   if (tab_->interstitial_page()) {
-    if (tab_->interstitial_page()->action_taken())
+    if (tab_->interstitial_page()->action_taken()) {
       tab_->interstitial_page()->Hide();
-    else
+    } else {
+      // If we are currently showing an interstitial page for which we created
+      // a transient entry and a new interstitial is shown as the result of a
+      // new browser initiated navigation, then that transient entry has already
+      // been discarded and a new pending navigation entry created.
+      // So we should not discard that new pending navigation entry.
+      // See http://crbug.com/9791
+      if (new_navigation_ && tab_->interstitial_page()->new_navigation_)
+        tab_->interstitial_page()->should_discard_pending_nav_entry_= false;
       tab_->interstitial_page()->DontProceed();
+    }
   }
 
   // Block the resource requests for the render view host while it is hidden.
   TakeActionOnResourceDispatcher(BLOCK);
   // We need to be notified when the RenderViewHost is destroyed so we can
   // cancel the blocked requests.  We cannot do that on
   // NOTIFY_TAB_CONTENTS_DESTROYED as at that point the RenderViewHost has
   // already been destroyed.
   notification_registrar_.Add(
       this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
@@ skipping 154 matching lines @@
   // If this is a new navigation, we are returning to the original page, so we
   // resume blocked requests for it.  If it is not a new navigation, then it
   // means the interstitial was shown as a result of a resource loading in the
   // page and we won't return to the original page, so we cancel blocked
   // requests in that case.
   if (new_navigation_)
     TakeActionOnResourceDispatcher(RESUME);
   else
     TakeActionOnResourceDispatcher(CANCEL);
 
-  if (new_navigation_) {
+  if (should_discard_pending_nav_entry_) {
     // Since no navigation happens we have to discard the transient entry
     // explicitely.  Note that by calling DiscardNonCommittedEntries() we also
     // discard the pending entry, which is what we want, since the navigation is
     // cancelled.
     tab_->controller().DiscardNonCommittedEntries();
   }
 
   Hide();
   // WARNING: we are now deleted!
 }
@@ skipping 165 matching lines @@
 void InterstitialPage::InterstitialPageRVHViewDelegate::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   if (interstitial_page_->tab() && interstitial_page_->tab()->GetViewDelegate())
     interstitial_page_->tab()->GetViewDelegate()->HandleKeyboardEvent(event);
 }
 
 void InterstitialPage::InterstitialPageRVHViewDelegate::OnFindReply(
     int request_id, int number_of_matches, const gfx::Rect& selection_rect,
     int active_match_ordinal, bool final_update) {
 }