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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1312643002: Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@opener-CreateOpenerProxiesIfNeeded
Patch Set: Add NewFrameProxy plumbing and test Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 return iter->second; 566 return iter->second;
567 return NULL; 567 return NULL;
568 } 568 }
569 569
570 // static 570 // static
571 void RenderFrameImpl::CreateFrame( 571 void RenderFrameImpl::CreateFrame(
572 int routing_id, 572 int routing_id,
573 int parent_routing_id, 573 int parent_routing_id,
574 int previous_sibling_routing_id, 574 int previous_sibling_routing_id,
575 int proxy_routing_id, 575 int proxy_routing_id,
576 int opener_routing_id,
576 const FrameReplicationState& replicated_state, 577 const FrameReplicationState& replicated_state,
577 CompositorDependencies* compositor_deps, 578 CompositorDependencies* compositor_deps,
578 const FrameMsg_NewFrame_WidgetParams& widget_params) { 579 const FrameMsg_NewFrame_WidgetParams& widget_params) {
579 blink::WebLocalFrame* web_frame; 580 blink::WebLocalFrame* web_frame;
580 RenderFrameImpl* render_frame; 581 RenderFrameImpl* render_frame;
581 if (proxy_routing_id == MSG_ROUTING_NONE) { 582 if (proxy_routing_id == MSG_ROUTING_NONE) {
582 RenderFrameProxy* parent_proxy = 583 RenderFrameProxy* parent_proxy =
583 RenderFrameProxy::FromRoutingID(parent_routing_id); 584 RenderFrameProxy::FromRoutingID(parent_routing_id);
584 // If the browser is sending a valid parent routing id, it should already 585 // If the browser is sending a valid parent routing id, it should already
585 // be created and registered. 586 // be created and registered.
(...skipping 21 matching lines...) Expand all
607 web_frame = 608 web_frame =
608 blink::WebLocalFrame::create(replicated_state.scope, render_frame); 609 blink::WebLocalFrame::create(replicated_state.scope, render_frame);
609 render_frame->proxy_routing_id_ = proxy_routing_id; 610 render_frame->proxy_routing_id_ = proxy_routing_id;
610 web_frame->initializeToReplaceRemoteFrame( 611 web_frame->initializeToReplaceRemoteFrame(
611 proxy->web_frame(), WebString::fromUTF8(replicated_state.name), 612 proxy->web_frame(), WebString::fromUTF8(replicated_state.name),
612 replicated_state.sandbox_flags); 613 replicated_state.sandbox_flags);
613 } 614 }
614 render_frame->SetWebFrame(web_frame); 615 render_frame->SetWebFrame(web_frame);
615 CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent()); 616 CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent());
616 617
618 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr);
619 web_frame->setOpener(opener);
620
617 if (widget_params.routing_id != MSG_ROUTING_NONE) { 621 if (widget_params.routing_id != MSG_ROUTING_NONE) {
618 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible()); 622 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible());
619 render_frame->render_widget_ = RenderWidget::CreateForFrame( 623 render_frame->render_widget_ = RenderWidget::CreateForFrame(
620 widget_params.routing_id, widget_params.surface_id, 624 widget_params.routing_id, widget_params.surface_id,
621 widget_params.hidden, render_frame->render_view_->screen_info(), 625 widget_params.hidden, render_frame->render_view_->screen_info(),
622 compositor_deps, web_frame); 626 compositor_deps, web_frame);
623 // TODO(kenrb): Observing shouldn't be necessary when we sort out 627 // TODO(kenrb): Observing shouldn't be necessary when we sort out
624 // WasShown and WasHidden, separating page-level visibility from 628 // WasShown and WasHidden, separating page-level visibility from
625 // frame-level visibility. 629 // frame-level visibility.
626 render_frame->render_widget_->RegisterRenderFrame(render_frame); 630 render_frame->render_widget_->RegisterRenderFrame(render_frame);
(...skipping 4487 matching lines...) Expand 10 before | Expand all | Expand 10 after
5114 DCHECK(mojo_shell_); 5118 DCHECK(mojo_shell_);
5115 mojo::ServiceProviderPtr service_provider; 5119 mojo::ServiceProviderPtr service_provider;
5116 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5120 mojo::URLRequestPtr request(mojo::URLRequest::New());
5117 request->url = mojo::String::From(url); 5121 request->url = mojo::String::From(url);
5118 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5122 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5119 nullptr, nullptr); 5123 nullptr, nullptr);
5120 return service_provider.Pass(); 5124 return service_provider.Pass();
5121 } 5125 }
5122 5126
5123 } // namespace content 5127 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698