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 590 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 } | 601 } |
602 render_frame->SetWebFrame(web_frame); | 602 render_frame->SetWebFrame(web_frame); |
603 CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent()); | 603 CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent()); |
604 | 604 |
605 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr); | 605 WebFrame* opener = ResolveOpener(opener_routing_id, nullptr); |
606 web_frame->setOpener(opener); | 606 web_frame->setOpener(opener); |
607 | 607 |
608 if (widget_params.routing_id != MSG_ROUTING_NONE) { | 608 if (widget_params.routing_id != MSG_ROUTING_NONE) { |
609 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible()); | 609 CHECK(SiteIsolationPolicy::AreCrossProcessFramesPossible()); |
610 render_frame->render_widget_ = RenderWidget::CreateForFrame( | 610 render_frame->render_widget_ = RenderWidget::CreateForFrame( |
611 widget_params.routing_id, widget_params.surface_id, | 611 widget_params.routing_id, widget_params.hidden, |
612 widget_params.hidden, render_frame->render_view_->screen_info(), | 612 render_frame->render_view_->screen_info(), compositor_deps, web_frame); |
613 compositor_deps, web_frame); | |
614 // TODO(kenrb): Observing shouldn't be necessary when we sort out | 613 // TODO(kenrb): Observing shouldn't be necessary when we sort out |
615 // WasShown and WasHidden, separating page-level visibility from | 614 // WasShown and WasHidden, separating page-level visibility from |
616 // frame-level visibility. | 615 // frame-level visibility. |
617 render_frame->render_widget_->RegisterRenderFrame(render_frame); | 616 render_frame->render_widget_->RegisterRenderFrame(render_frame); |
618 } | 617 } |
619 | 618 |
620 render_frame->Initialize(); | 619 render_frame->Initialize(); |
621 } | 620 } |
622 | 621 |
623 // static | 622 // static |
(...skipping 4508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5132 mojo::ServiceProviderPtr service_provider; | 5131 mojo::ServiceProviderPtr service_provider; |
5133 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5132 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5134 request->url = mojo::String::From(url); | 5133 request->url = mojo::String::From(url); |
5135 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5134 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5136 nullptr, nullptr, | 5135 nullptr, nullptr, |
5137 base::Bind(&OnGotContentHandlerID)); | 5136 base::Bind(&OnGotContentHandlerID)); |
5138 return service_provider.Pass(); | 5137 return service_provider.Pass(); |
5139 } | 5138 } |
5140 | 5139 |
5141 } // namespace content | 5140 } // namespace content |
OLD | NEW |