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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1224363002: OOPIF: Fix window.open to work from frames with remote parent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 08e220bde7322812df0dad094a7d10990a28fc75..9917dc49a09ac45d05b05fbcb0f7c39dab5a3e12 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -985,9 +985,8 @@ void RenderViewHostImpl::CreateNewWindow(
GetProcess()->FilterURL(false, &validated_params.opener_url);
GetProcess()->FilterURL(true, &validated_params.opener_security_origin);
- delegate_->CreateNewWindow(
- GetProcess()->GetID(), route_id, main_frame_route_id, validated_params,
- session_storage_namespace);
+ delegate_->CreateNewWindow(GetSiteInstance(), route_id, main_frame_route_id,
+ validated_params, session_storage_namespace);
}
void RenderViewHostImpl::CreateNewWidget(int route_id,
@@ -1003,23 +1002,19 @@ void RenderViewHostImpl::OnShowView(int route_id,
WindowOpenDisposition disposition,
const gfx::Rect& initial_rect,
bool user_gesture) {
- if (is_active_) {
alexmos 2015/07/09 22:14:06 Is it ok to remove these? I saw you introduced th
Charlie Reis 2015/07/09 23:42:51 I agree with your CL description that these should
alexmos 2015/07/10 18:35:00 I took a look at it, and it should be relatively s
Charlie Reis 2015/07/10 21:44:49 Yeah, let's leave these two checks until we're rea
- delegate_->ShowCreatedWindow(
- route_id, disposition, initial_rect, user_gesture);
- }
+ delegate_->ShowCreatedWindow(route_id, disposition, initial_rect,
+ user_gesture);
Send(new ViewMsg_Move_ACK(route_id));
}
void RenderViewHostImpl::OnShowWidget(int route_id,
const gfx::Rect& initial_rect) {
- if (is_active_)
- delegate_->ShowCreatedWidget(route_id, initial_rect);
+ delegate_->ShowCreatedWidget(route_id, initial_rect);
Send(new ViewMsg_Move_ACK(route_id));
}
void RenderViewHostImpl::OnShowFullscreenWidget(int route_id) {
- if (is_active_)
- delegate_->ShowCreatedFullscreenWidget(route_id);
+ delegate_->ShowCreatedFullscreenWidget(route_id);
Send(new ViewMsg_Move_ACK(route_id));
}

Powered by Google App Engine
This is Rietveld 408576698