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 ae8d9f9ddc4ff6cd18c405da388ebe0e6334e09a..ee18a82ec01d5a236c0fad32ba802335e937791b 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -419,26 +419,26 @@ 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 dest_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.
   // 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* dest_instance,
+                                      ui::PageTransition dest_transition,
+                                      bool dest_is_restore,
+                                      bool dest_is_view_source_mode,
+                                      SiteInstance* current_instance,

[Charlie Reis, 2014/12/06 00:18:50]

Please put current_instance between source_instance and dest_instance, and
explain the difference in the comment.  (Source == the frame that initiated the
navigation, current == the frame being navigated, dest == a possibly
predetermined result for the frame being navigated.)

[lfg, 2014/12/08 20:45:33]

Done.

+                                      bool force_browsing_instance_swap);
 
   // Determines the appropriate url to use as the current url for SiteInstance
   // selection.
@@ -515,11 +515,12 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
       scoped_ptr<RenderFrameHostImpl> render_frame_host);
 
   RenderFrameHostImpl* UpdateStateForNavigate(
-      const GURL& url,
-      SiteInstance* instance,
-      ui::PageTransition transition,
-      bool is_restore,
-      bool is_view_source_mode,
+      const GURL& dest_url,
+      SiteInstance* source_instance,
+      SiteInstance* dest_instance,
+      ui::PageTransition dest_transition,

[Charlie Reis, 2014/12/06 00:18:50]

Actually, let's remove dest_ from transition in the cases above rather than add
it here.  Transition is a property of the navigation, not the source or the
destination.

[lfg, 2014/12/08 20:45:33]

Done.

+      bool dest_is_restore,
+      bool dest_is_view_source_mode,
       const GlobalRequestID& transferred_request_id,
       int bindings);