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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
561 // static | 561 // static |
562 RenderFrameImpl* RenderFrameImpl::FromRoutingID(int routing_id) { | 562 RenderFrameImpl* RenderFrameImpl::FromRoutingID(int routing_id) { |
563 RoutingIDFrameMap::iterator iter = | 563 RoutingIDFrameMap::iterator iter = |
564 g_routing_id_frame_map.Get().find(routing_id); | 564 g_routing_id_frame_map.Get().find(routing_id); |
565 if (iter != g_routing_id_frame_map.Get().end()) | 565 if (iter != g_routing_id_frame_map.Get().end()) |
566 return iter->second; | 566 return iter->second; |
567 return NULL; | 567 return NULL; |
568 } | 568 } |
569 | 569 |
570 // static | 570 // static |
571 RenderFrameImpl* RenderFrameImpl::CreateMainFrame(RenderViewImpl* render_view, | 571 RenderFrameImpl* RenderFrameImpl::CreateMainFrame( |
572 int32 routing_id) { | 572 RenderViewImpl* render_view, |
| 573 int32 routing_id, |
| 574 int32 widget_routing_id, |
| 575 int32 surface_id, |
| 576 bool hidden, |
| 577 const blink::WebScreenInfo& screen_info, |
| 578 CompositorDependencies* compositor_deps) { |
| 579 // A main frame RenderFrame must have a RenderWidget. |
| 580 DCHECK_NE(MSG_ROUTING_NONE, widget_routing_id); |
| 581 |
573 RenderFrameImpl* render_frame = | 582 RenderFrameImpl* render_frame = |
574 RenderFrameImpl::Create(render_view, routing_id); | 583 RenderFrameImpl::Create(render_view, routing_id); |
575 WebLocalFrame* web_frame = | 584 WebLocalFrame* web_frame = |
576 WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame); | 585 WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame); |
577 render_frame->SetWebFrame(web_frame); | 586 render_frame->SetWebFrame(web_frame); |
578 render_view->webview()->setMainFrame(web_frame); | 587 render_view->webview()->setMainFrame(web_frame); |
| 588 render_frame->render_widget_ = |
| 589 RenderWidget::CreateForFrame(widget_routing_id, surface_id, hidden, |
| 590 screen_info, compositor_deps, web_frame); |
| 591 // TODO(kenrb): Observing shouldn't be necessary when we sort out |
| 592 // WasShown and WasHidden, separating page-level visibility from |
| 593 // frame-level visibility. |
| 594 render_frame->render_widget_->RegisterRenderFrame(render_frame); |
579 return render_frame; | 595 return render_frame; |
580 } | 596 } |
581 | 597 |
582 // static | 598 // static |
583 void RenderFrameImpl::CreateFrame( | 599 void RenderFrameImpl::CreateFrame( |
584 int routing_id, | 600 int routing_id, |
585 int proxy_routing_id, | 601 int proxy_routing_id, |
586 int opener_routing_id, | 602 int opener_routing_id, |
587 int parent_routing_id, | 603 int parent_routing_id, |
588 int previous_sibling_routing_id, | 604 int previous_sibling_routing_id, |
(...skipping 4511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5100 mojo::ServiceProviderPtr service_provider; | 5116 mojo::ServiceProviderPtr service_provider; |
5101 mojo::URLRequestPtr request(mojo::URLRequest::New()); | 5117 mojo::URLRequestPtr request(mojo::URLRequest::New()); |
5102 request->url = mojo::String::From(url); | 5118 request->url = mojo::String::From(url); |
5103 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), | 5119 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), |
5104 nullptr, nullptr, | 5120 nullptr, nullptr, |
5105 base::Bind(&OnGotContentHandlerID)); | 5121 base::Bind(&OnGotContentHandlerID)); |
5106 return service_provider.Pass(); | 5122 return service_provider.Pass(); |
5107 } | 5123 } |
5108 | 5124 |
5109 } // namespace content | 5125 } // namespace content |
OLD | NEW |