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

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

Issue 794673002: Null out a field in the RenderFrameHostImpl dtor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | no next file » | 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.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 72d53245905548c7587908e18958539a1e3f6875..80c087768461186bf34ec1aee6d39a6928421453 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -175,6 +175,10 @@ RenderFrameHostImpl::~RenderFrameHostImpl() {
// Notify the FrameTree that this RFH is going away, allowing it to shut down
// the corresponding RenderViewHost if it is no longer needed.
frame_tree_->UnregisterRenderFrameHost(this);
+
+ // NULL out the swapout timer; in crash dumps this member will be null only if
+ // the dtor has run.
+ swapout_event_monitor_timeout_.reset();
Evan Stade 2014/12/10 22:02:18 sorta surprised scoped_ptr doesn't already null ou
ncarter (slow) 2014/12/10 22:09:50 I was surprised too, but it turns out that ~scoped
}
int RenderFrameHostImpl::GetRoutingID() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698