Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(995)

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6879114: Cancels prerendering on prerendering RenderView crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Sync Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_contents.cc
===================================================================
--- chrome/browser/prerender/prerender_contents.cc (revision 82702)
+++ chrome/browser/prerender/prerender_contents.cc (working copy)
@@ -247,9 +247,19 @@
return extension_misc::kUnknownWindowId;
}
+void PrerenderContents::RenderViewGone(RenderViewHost* render_view_host,
+ base::TerminationStatus status,
+ int error_code) {
+ DCHECK_EQ(render_view_host_, render_view_host);
+ // Cancel the prerender if the RenderView crashes.
+ Destroy(FINAL_STATUS_RENDERER_CRASHED);
+}
+
void PrerenderContents::DidNavigate(
RenderViewHost* render_view_host,
const ViewHostMsg_FrameNavigate_Params& params) {
+ DCHECK_EQ(render_view_host_, render_view_host);
+
// We only care when the outer frame changes.
if (!PageTransition::IsMainFrame(params.transition))
return;
@@ -271,6 +281,7 @@
RenderViewHost* render_view_host,
int32 page_id,
const base::i18n::String16WithDirection& title) {
+ DCHECK_EQ(render_view_host_, render_view_host);
if (title.string().empty())
return;
@@ -527,6 +538,7 @@
void PrerenderContents::RendererUnresponsive(RenderViewHost* render_view_host,
bool is_during_unload) {
+ DCHECK_EQ(render_view_host_, render_view_host);
Destroy(FINAL_STATUS_RENDERER_UNRESPONSIVE);
}

Powered by Google App Engine
This is Rietveld 408576698