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

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

Issue 799593004: Don't crash while detaching a pending child frame under --site-per-process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: size_t unsigned compile fix Created 6 years 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 | « no previous file | content/browser/frame_host/render_frame_host_manager.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_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 4d60c0eede89664e8fea23bf2c2b9975e2991c95..043b0a982d3d73542d4116bd91e45ba2648ad43b 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -507,9 +507,13 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
// swapped out.
void ShutdownRenderFrameProxyHostsInSiteInstance(int32 site_instance_id);
- // Helper method to terminate the pending RenderViewHost.
+ // Helper method to terminate the pending RenderFrameHost. The frame may be
+ // deleted immediately, or it may be kept around in hopes of later reuse.
void CancelPending();
+ // Clears pending_render_frame_host_, returning it to the caller for disposal.
+ scoped_ptr<RenderFrameHostImpl> UnsetPendingRenderFrameHost();
+
// Helper method to set the active RenderFrameHost. Returns the old
// RenderFrameHost and updates counts.
scoped_ptr<RenderFrameHostImpl> SetRenderFrameHost(
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698