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

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: Resolve conflict with Daniel's CL Created 5 years, 3 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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 WebLocalFrame* web_frame = 573 WebLocalFrame* web_frame =
574 WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame); 574 WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame);
575 render_frame->SetWebFrame(web_frame); 575 render_frame->SetWebFrame(web_frame);
576 render_view->webview()->setMainFrame(web_frame); 576 render_view->webview()->setMainFrame(web_frame);
577 return render_frame; 577 return render_frame;
578 } 578 }
579 579
580 // static 580 // static
581 void RenderFrameImpl::CreateFrame( 581 void RenderFrameImpl::CreateFrame(
582 int routing_id, 582 int routing_id,
583 int proxy_routing_id,
584 int opener_routing_id,
583 int parent_routing_id, 585 int parent_routing_id,
584 int previous_sibling_routing_id, 586 int previous_sibling_routing_id,
585 int proxy_routing_id,
586 const FrameReplicationState& replicated_state, 587 const FrameReplicationState& replicated_state,
587 CompositorDependencies* compositor_deps, 588 CompositorDependencies* compositor_deps,
588 const FrameMsg_NewFrame_WidgetParams& widget_params) { 589 const FrameMsg_NewFrame_WidgetParams& widget_params) {
589 blink::WebLocalFrame* web_frame; 590 blink::WebLocalFrame* web_frame;
590 RenderFrameImpl* render_frame; 591 RenderFrameImpl* render_frame;
591 if (proxy_routing_id == MSG_ROUTING_NONE) { 592 if (proxy_routing_id == MSG_ROUTING_NONE) {
592 RenderFrameProxy* parent_proxy = 593 RenderFrameProxy* parent_proxy =
593 RenderFrameProxy::FromRoutingID(parent_routing_id); 594 RenderFrameProxy::FromRoutingID(parent_routing_id);
594 // If the browser is sending a valid parent routing id, it should already 595 // If the browser is sending a valid parent routing id, it should already
595 // be created and registered. 596 // be created and registered.
(...skipping 21 matching lines...) Expand all
617 web_frame = 618 web_frame =
618 blink::WebLocalFrame::create(replicated_state.scope, render_frame); 619 blink::WebLocalFrame::create(replicated_state.scope, render_frame);
619 render_frame->proxy_routing_id_ = proxy_routing_id; 620 render_frame->proxy_routing_id_ = proxy_routing_id;
620 web_frame->initializeToReplaceRemoteFrame( 621 web_frame->initializeToReplaceRemoteFrame(
621 proxy->web_frame(), WebString::fromUTF8(replicated_state.name), 622 proxy->web_frame(), WebString::fromUTF8(replicated_state.name),
622 replicated_state.sandbox_flags); 623 replicated_state.sandbox_flags);
623 } 624 }
624 render_frame->SetWebFrame(web_frame); 625 render_frame->SetWebFrame(web_frame);
625 CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent()); 626 CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent());
626 627
628 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr);
629 web_frame->setOpener(opener);
630
627 if (widget_params.routing_id != MSG_ROUTING_NONE) { 631 if (widget_params.routing_id != MSG_ROUTING_NONE) {
628 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible()); 632 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible());
629 render_frame->render_widget_ = RenderWidget::CreateForFrame( 633 render_frame->render_widget_ = RenderWidget::CreateForFrame(
630 widget_params.routing_id, widget_params.surface_id, 634 widget_params.routing_id, widget_params.surface_id,
631 widget_params.hidden, render_frame->render_view_->screen_info(), 635 widget_params.hidden, render_frame->render_view_->screen_info(),
632 compositor_deps, web_frame); 636 compositor_deps, web_frame);
633 // TODO(kenrb): Observing shouldn't be necessary when we sort out 637 // TODO(kenrb): Observing shouldn't be necessary when we sort out
634 // WasShown and WasHidden, separating page-level visibility from 638 // WasShown and WasHidden, separating page-level visibility from
635 // frame-level visibility. 639 // frame-level visibility.
636 render_frame->render_widget_->RegisterRenderFrame(render_frame); 640 render_frame->render_widget_->RegisterRenderFrame(render_frame);
(...skipping 4455 matching lines...) Expand 10 before | Expand all | Expand 10 after
5092 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); 5096 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
5093 mojo::ServiceProviderPtr service_provider; 5097 mojo::ServiceProviderPtr service_provider;
5094 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5098 mojo::URLRequestPtr request(mojo::URLRequest::New());
5095 request->url = mojo::String::From(url); 5099 request->url = mojo::String::From(url);
5096 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5100 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5097 nullptr, nullptr); 5101 nullptr, nullptr);
5098 return service_provider.Pass(); 5102 return service_provider.Pass();
5099 } 5103 }
5100 5104
5101 } // namespace content 5105 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698