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

Unified Diff: content/browser/frame_host/navigator_impl.cc

Issue 743773003: OOPIF: Data URLs are now rendered in the renderer that initiated the navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test. Created 6 years, 1 month 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/frame_host/navigator_impl.cc
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
index be9bcfe812bbc7f226884c8903b10274bad3d016..b111245299e9128976272a05b2f685dd8269eed2 100644
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
@@ -616,13 +616,13 @@ bool NavigatorImpl::ShouldAssignSiteForURL(const GURL& url) {
return GetContentClient()->browser()->ShouldAssignSiteForURL(url);
}
-void NavigatorImpl::RequestOpenURL(
- RenderFrameHostImpl* render_frame_host,
- const GURL& url,
- const Referrer& referrer,
- WindowOpenDisposition disposition,
- bool should_replace_current_entry,
- bool user_gesture) {
+void NavigatorImpl::RequestOpenURL(RenderFrameHostImpl* render_frame_host,
+ const GURL& url,
+ SiteInstance* site_instance,
+ const Referrer& referrer,
+ WindowOpenDisposition disposition,
+ bool should_replace_current_entry,
+ bool user_gesture) {
SiteInstance* current_site_instance =
GetRenderManager(render_frame_host)->current_frame_host()->
GetSiteInstance();
@@ -640,20 +640,16 @@ void NavigatorImpl::RequestOpenURL(
// TODO(creis): Pass the redirect_chain into this method to support client
// redirects. http://crbug.com/311721.
std::vector<GURL> redirect_chain;
- RequestTransferURL(render_frame_host,
- url,
- redirect_chain,
- referrer,
- ui::PAGE_TRANSITION_LINK,
- disposition,
- GlobalRequestID(),
- should_replace_current_entry,
+ RequestTransferURL(render_frame_host, url, site_instance, redirect_chain,
+ referrer, ui::PAGE_TRANSITION_LINK, disposition,
+ GlobalRequestID(), should_replace_current_entry,
user_gesture);
}
void NavigatorImpl::RequestTransferURL(
RenderFrameHostImpl* render_frame_host,
const GURL& url,
+ SiteInstance* site_instance,
const std::vector<GURL>& redirect_chain,
const Referrer& referrer,
ui::PageTransition page_transition,
@@ -679,6 +675,7 @@ void NavigatorImpl::RequestTransferURL(
OpenURLParams params(
dest_url, referrer, frame_tree_node_id, disposition, page_transition,
true /* is_renderer_initiated */);
+ params.site_instance = site_instance;
if (redirect_chain.size() > 0)
params.redirect_chain = redirect_chain;
params.transferred_global_request_id = transferred_global_request_id;

Powered by Google App Engine
This is Rietveld 408576698