OOPIF: Handle cross-site frames being blocked by X-Frame-Options or CSP.

content/browser/frame_host/navigator_impl.cc

 // Copyright 2013 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 "content/browser/frame_host/navigator_impl.h"
 
 #include <utility>
 
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 209 matching lines @@
   bool should_preserve_entry = controller_->IsUnmodifiedBlankTab() ||
       delegate_->ShouldPreserveAbortedURLs();
   if (controller_->GetPendingEntry() != controller_->GetVisibleEntry() ||
       !should_preserve_entry) {
     controller_->DiscardPendingEntry(true);
 
     // Also force the UI to refresh.
     controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL);
   }
 
+  // If this failure came from a pending RenderFrameHost rather than the
+  // current one, the current RenderFrameHost needs to be notified to stop
+  // its load.  Typically, the pending RenderFrameHost should be created only
+  // once the browser process is sure that it will commit, but there is a case
+  // where this is currently not true, which is when a cross-process frame is
+  // blocked by X-Frame-Options or CSP frame-ancestors.  This check will also
+  // guard against any future such cases.
+  //
+  // TODO(mkwst, alexmos): The case above should disappear when X-Frame-Options
+  // and CSP enforcement moves to the browser process
+  // (https://crbug.com/555418).
+  RenderFrameHostManager* manager =
+      render_frame_host->frame_tree_node()->render_manager();
+  if (render_frame_host == manager->pending_frame_host())
+    manager->current_frame_host()->Stop();
+
   if (delegate_)
     delegate_->DidFailProvisionalLoadWithError(render_frame_host, params);
 }
 
 void NavigatorImpl::DidFailLoadWithError(
     RenderFrameHostImpl* render_frame_host,
     const GURL& url,
     int error_code,
     const base::string16& error_description,
     bool was_ignored_by_handler) {
@@ skipping 837 matching lines @@
       entry->set_should_replace_entry(pending_entry->should_replace_entry());
       entry->SetRedirectChain(pending_entry->GetRedirectChain());
     }
     controller_->SetPendingEntry(std::move(entry));
     if (delegate_)
       delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL);
   }
 }
 
 }  // namespace content