OOPIF: Data URLs are now rendered in the renderer that initiated the navigation.

content/browser/frame_host/render_frame_host_manager.h

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 4d60c0eede89664e8fea23bf2c2b9975e2991c95..d68bdd3789a31b2efbd47c49e2856d8a7dd82534 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -420,26 +420,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

[nasko, 2014/12/11 01:14:44]

nit: I'd avoid putting each param description on a new line, as it leaves lots
of whitespace that isn't used.

[lfg, 2014/12/11 23:55:24]

Done.

+  // navigation.
+  // |current_instance| is the SiteInstance of the frame that is currently

[nasko, 2014/12/11 01:14:44]

An example explaining the difference between the current and source will be
helpful. I'm not quite sure I get it just be reading the comment.

[lfg, 2014/12/11 23:55:24]

Done.

+  // navigating.
+  // |dest_instance|, is a predetermined SiteInstance that'll be used if not
+  // null.
   // 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.
@@ -516,11 +522,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);