content/renderer/render_view_impl.cc - Issue 972313002: Make <webview> use out-of-process iframe architecture.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_view_impl.cc

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome

Patch Set: not using NPAPI bindings anymore, yay! Created 5 years, 7 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

« content/renderer/render_frame_proxy.h ('K') | « content/renderer/render_frame_proxy.cc ('k') | extensions/browser/guest_view/extensions_guest_view_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index eb9971320db4aaff0a97e71a2efcc757be981ee0..214cddc4ed3d942ba34a67a809cac41d78481961 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -731,7 +731,10 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,

ApplyWebPreferences(webkit_preferences_, webview());

RenderFrameProxy* proxy = NULL;

- if (params.proxy_routing_id != MSG_ROUTING_NONE) {

+ if (params.proxy_routing_id != MSG_ROUTING_NONE &&

+ // Do not create a proxy here if this is a swapped out RenderView for

+ // a guest. The proxy will be created in RenderFrameImpl::OnSwapOut().

+ !params.is_guest) {

CHECK(params.swapped_out);

proxy = RenderFrameProxy::CreateProxyToReplaceFrame(

main_render_frame_.get(), params.proxy_routing_id);