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

Unified Diff: content/browser/tab_contents/render_view_host_manager.h

Issue 6319001: Support window.opener after a process swap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 9 years, 7 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/site_instance.cc ('k') | content/browser/tab_contents/render_view_host_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/tab_contents/render_view_host_manager.h
diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/tab_contents/render_view_host_manager.h
index e2033d15ee44e6e389d5bd5d0fc5d01b5de93a4f..6dc4d7d723e6e91b9d2508f413eb42c15df49cbd 100644
--- a/content/browser/tab_contents/render_view_host_manager.h
+++ b/content/browser/tab_contents/render_view_host_manager.h
@@ -12,6 +12,7 @@
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
+#include "content/browser/site_instance.h"
class WebUI;
class InterstitialPage;
@@ -20,7 +21,6 @@ class NavigationEntry;
class Profile;
class RenderWidgetHostView;
class RenderViewHost;
-class SiteInstance;
// Manages RenderViewHosts for a TabContents. Normally there is only one and
// it is easy to do. But we can also have transitions of processes (and hence
@@ -186,6 +186,10 @@ class RenderViewHostManager
// deleted.
void SwapInRenderViewHost(RenderViewHost* rvh);
+ // Returns whether the given RenderViewHost is on the list of swapped out
+ // RenderViewHosts.
+ bool IsSwappedOut(RenderViewHost* rvh);
+
private:
friend class TestTabContents;
friend class RenderViewHostManagerTest;
@@ -265,6 +269,10 @@ class RenderViewHostManager
RenderViewHost* pending_render_view_host_;
scoped_ptr<WebUI> pending_web_ui_;
+ // A map of site instance ID to swapped out RenderViewHosts.
+ typedef base::hash_map<int32, RenderViewHost*> RenderViewHostMap;
+ RenderViewHostMap swapped_out_hosts_;
+
// The intersitial page currently shown if any, not own by this class
// (the InterstitialPage is self-owned, it deletes itself when hidden).
InterstitialPage* interstitial_page_;
« no previous file with comments | « content/browser/site_instance.cc ('k') | content/browser/tab_contents/render_view_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698