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

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

Issue 6319001: Support window.opener after a process swap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unload; chrome dependency in RenderWidget. 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: content/browser/renderer_host/browser_render_process_host.h
diff --git a/content/browser/renderer_host/browser_render_process_host.h b/content/browser/renderer_host/browser_render_process_host.h
index d3eee336baa8ec0ee83e940973273aa2049c0a63..68958ff8e440078d062920a10d1c36b9b99b8123 100644
--- a/content/browser/renderer_host/browser_render_process_host.h
+++ b/content/browser/renderer_host/browser_render_process_host.h
@@ -50,7 +50,7 @@ class BrowserRenderProcessHost : public RenderProcessHost,
virtual bool Init(bool is_accessibility_enabled, bool is_extensions_process);
virtual int GetNextRoutingID();
virtual void CancelResourceRequests(int render_widget_id);
- virtual void CrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
+ virtual void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
virtual bool WaitForUpdateMsg(int render_widget_id,
const base::TimeDelta& max_delay,
IPC::Message* msg);
@@ -58,6 +58,9 @@ class BrowserRenderProcessHost : public RenderProcessHost,
virtual void WidgetRestored();
virtual void WidgetHidden();
virtual int VisibleWidgetCount() const;
+ virtual void AddPendingView();
+ virtual void RemovePendingView();
+ virtual int PendingViewCount() const;
virtual bool FastShutdownIfPossible();
virtual bool SendWithTimeout(IPC::Message* msg, int timeout_ms);
virtual base::ProcessHandle GetHandle();
@@ -81,6 +84,7 @@ class BrowserRenderProcessHost : public RenderProcessHost,
void CreateMessageFilters();
// Control message handlers.
+ void OnShutdownRequest();
void OnUpdatedCacheStats(const WebKit::WebCache::UsageStats& stats);
void SuddenTerminationChanged(bool enabled);
void OnUserMetricsRecordAction(const std::string& action);
@@ -103,6 +107,11 @@ class BrowserRenderProcessHost : public RenderProcessHost,
// backgrounded.
int32 visible_widgets_;
+ // The count of currently swapped out but pending RenderViews. We have
+ // started to swap these back in, so the renderer process should not exit if
+ // this count is non-zero.
+ int32 pending_views_;
+
// Does this process have backgrounded priority.
bool backgrounded_;

Powered by Google App Engine
This is Rietveld 408576698