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