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 ae8d9f9ddc4ff6cd18c405da388ebe0e6334e09a..a0d7b6cc96bad92efc0bda024fe9ad05299e7d7f 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.h |
+++ b/content/browser/frame_host/render_frame_host_manager.h |
@@ -419,26 +419,32 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
const GURL& new_url) const; |
// Returns the SiteInstance to use for the navigation. |
- SiteInstance* GetSiteInstanceForNavigation( |
- const GURL& dest_url, |
- SiteInstance* dest_instance, |
- ui::PageTransition dest_transition, |
- bool dest_is_restore, |
- bool dest_is_view_source_mode); |
+ SiteInstance* GetSiteInstanceForNavigation(const GURL& dest_url, |
+ SiteInstance* source_instance, |
+ SiteInstance* dest_instance, |
+ ui::PageTransition transition, |
+ bool dest_is_restore, |
+ bool dest_is_view_source_mode); |
// Returns an appropriate SiteInstance object for the given |dest_url|, |
// possibly reusing the current SiteInstance. If --process-per-tab is used, |
// this is only called when ShouldSwapBrowsingInstancesForNavigation returns |
- // true. |dest_instance| will be used if it is not null. |
+ // true. |
+ // |source_instance| is the SiteInstance of the frame that initiated the |
+ // navigation. |
+ // |current_instance| is the SiteInstance of the frame that is currently |
+ // navigating. |
+ // |dest_instance|, if not null, is a predetermined SiteInstance that'll be |
+ // used for the resulting frame. |
Charlie Reis
2014/12/09 19:14:37
nit: "resulting frame" seems to imply it could end
lfg
2014/12/10 21:53:00
Done.
|
// This is a helper function for GetSiteInstanceForNavigation. |
- SiteInstance* GetSiteInstanceForURL( |
- const GURL& dest_url, |
- SiteInstance* dest_instance, |
- ui::PageTransition dest_transition, |
- bool dest_is_restore, |
- bool dest_is_view_source_mode, |
- SiteInstance* current_instance, |
- bool force_browsing_instance_swap); |
+ SiteInstance* GetSiteInstanceForURL(const GURL& dest_url, |
+ SiteInstance* source_instance, |
+ SiteInstance* current_instance, |
+ SiteInstance* dest_instance, |
+ ui::PageTransition transition, |
+ bool dest_is_restore, |
+ bool dest_is_view_source_mode, |
+ bool force_browsing_instance_swap); |
// Determines the appropriate url to use as the current url for SiteInstance |
// selection. |
@@ -515,11 +521,12 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver { |
scoped_ptr<RenderFrameHostImpl> render_frame_host); |
RenderFrameHostImpl* UpdateStateForNavigate( |
- const GURL& url, |
- SiteInstance* instance, |
+ const GURL& dest_url, |
+ SiteInstance* source_instance, |
+ SiteInstance* dest_instance, |
ui::PageTransition transition, |
- bool is_restore, |
- bool is_view_source_mode, |
+ bool dest_is_restore, |
+ bool dest_is_view_source_mode, |
const GlobalRequestID& transferred_request_id, |
int bindings); |