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

Unified Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 1835833002: Fix 3 crashes related to navigations after a process dies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes from review Created 4 years, 9 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
« no previous file with comments | « content/browser/frame_host/frame_tree.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 9c447275d21f22286612fab8e7f5dd74ad85f37f..035ea4b84c45ace79d99ab421392f872d4290843 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -575,7 +575,13 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
friend class TestRenderFrameHost;
friend class TestRenderViewHost;
+ FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest,
+ CreateRenderViewAfterProcessKillAndClosedProxy);
+ FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest,
+ RenderViewInitAfterNewProxyAndProcessKill);
FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest, CrashSubframe);
+ FRIEND_TEST_ALL_PREFIXES(SitePerProcessBrowserTest,
+ RenderViewHostPendingDeletionIsNotReused);
// IPC Message handlers.
void OnAddMessageToConsole(int32_t level,
@@ -733,6 +739,10 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
FrameTreeNode* FindAndVerifyChild(int32_t child_frame_routing_id,
bad_message::BadMessageReason reason);
+ // Allows tests to disable the swapout event timer to simulate bugs that
+ // happen before it fires (to avoid flakiness).
+ void ResetSwapOutTimerForTesting();
+
// For now, RenderFrameHosts indirectly keep RenderViewHosts alive via a
// refcount that calls Shutdown when it reaches zero. This allows each
// RenderFrameHostManager to just care about RenderFrameHosts, while ensuring
« no previous file with comments | « content/browser/frame_host/frame_tree.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698