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

Unified Diff: content/browser/renderer_host/render_process_host_impl.h

Issue 1014623002: Revert "Refactor sudden termination" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase + fixed compilation error Created 5 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
Index: content/browser/renderer_host/render_process_host_impl.h
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index 6f61501e4da6c60e20a9bb6741dca9fd2a3484cf..93b7aa542f183dae50ead2786cf6783d31891534 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -122,6 +122,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
void Cleanup() override;
void AddPendingView() override;
void RemovePendingView() override;
+ void SetSuddenTerminationAllowed(bool enabled) override;
bool SuddenTerminationAllowed() const override;
IPC::ChannelProxy* GetChannel() override;
void AddFilter(BrowserMessageFilter* filter) override;
@@ -317,7 +318,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Control message handlers.
void OnShutdownRequest();
void OnDumpHandlesDone();
- void OnSuddenTerminationChanged(bool enabled);
+ void SuddenTerminationChanged(bool enabled);
void OnUserMetricsRecordAction(const std::string& action);
void OnSavedPageAsMHTML(int job_id, int64 mhtml_file_size);
void OnCloseACK(int old_route_id);
@@ -418,12 +419,12 @@ class CONTENT_EXPORT RenderProcessHostImpl
// The observers watching our lifetime.
ObserverList<RenderProcessHostObserver> observers_;
- // True if the process can be shut down suddenly. If this is true, then it's
- // sure that all the RenderFrames in the process can be shutdown suddenly. If
- // it's false, then specific RenderFrames might still be allowed to be
- // shutdown suddenly by checking their SuddenTerminationAllowed() flag. This
- // can occur when a RenderFrame has an unload/beforeUnload event listener
- // registered but another RenderFrame in the same process doesn't.
+ // True if the process can be shut down suddenly. If this is true, then we're
+ // sure that all the RenderViews in the process can be shutdown suddenly. If
+ // it's false, then specific RenderViews might still be allowed to be shutdown
+ // suddenly by checking their SuddenTerminationAllowed() flag. This can occur
+ // if one WebContents has an unload event listener but another WebContents in
+ // the same process doesn't.
bool sudden_termination_allowed_;
// Set to true if we shouldn't send input events. We actually do the
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698