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

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

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 RenderFrameImpl* RenderFrameImpl::FromRoutingID(int routing_id) { 561 RenderFrameImpl* RenderFrameImpl::FromRoutingID(int routing_id) {
562 RoutingIDFrameMap::iterator iter = 562 RoutingIDFrameMap::iterator iter =
563 g_routing_id_frame_map.Get().find(routing_id); 563 g_routing_id_frame_map.Get().find(routing_id);
564 if (iter != g_routing_id_frame_map.Get().end()) 564 if (iter != g_routing_id_frame_map.Get().end())
565 return iter->second; 565 return iter->second;
566 return NULL; 566 return NULL;
567 } 567 }
568 568
569 // static 569 // static
570 RenderFrameImpl* RenderFrameImpl::CreateMainFrame(RenderViewImpl* render_view, 570 RenderFrameImpl* RenderFrameImpl::CreateMainFrame(RenderViewImpl* render_view,
571 int32 routing_id) { 571 int32 routing_id,
572 int32 widget_routing_id,
573 int32 surface_id,
574 bool hidden,
575 const blink::WebScreenInfo& screen_info,
576 CompositorDependencies* compositor_deps) {
577 // A main frame RenderFrame must have a RenderWidget.
578 DCHECK_NE(MSG_ROUTING_NONE, widget_routing_id);
579
572 RenderFrameImpl* render_frame = 580 RenderFrameImpl* render_frame =
573 RenderFrameImpl::Create(render_view, routing_id); 581 RenderFrameImpl::Create(render_view, routing_id);
574 WebLocalFrame* web_frame = 582 WebLocalFrame* web_frame =
575 WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame); 583 WebLocalFrame::create(blink::WebTreeScopeType::Document, render_frame);
576 render_frame->SetWebFrame(web_frame); 584 render_frame->SetWebFrame(web_frame);
577 render_view->webview()->setMainFrame(web_frame); 585 render_view->webview()->setMainFrame(web_frame);
586 render_frame->render_widget_ =
587 RenderWidget::CreateForFrame(widget_routing_id, surface_id, hidden,
588 screen_info, compositor_deps, web_frame);
589 // TODO(kenrb): Observing shouldn't be necessary when we sort out
590 // WasShown and WasHidden, separating page-level visibility from
591 // frame-level visibility.
592 render_frame->render_widget_->RegisterRenderFrame(render_frame);
578 return render_frame; 593 return render_frame;
579 } 594 }
580 595
581 // static 596 // static
582 void RenderFrameImpl::CreateFrame( 597 void RenderFrameImpl::CreateFrame(
583 int routing_id, 598 int routing_id,
584 int parent_routing_id, 599 int parent_routing_id,
585 int previous_sibling_routing_id, 600 int previous_sibling_routing_id,
586 int proxy_routing_id, 601 int proxy_routing_id,
587 const FrameReplicationState& replicated_state, 602 const FrameReplicationState& replicated_state,
(...skipping 4536 matching lines...) Expand 10 before | Expand all | Expand 10 after
5124 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_)); 5139 GetServiceRegistry()->ConnectToRemoteService(mojo::GetProxy(&mojo_shell_));
5125 mojo::ServiceProviderPtr service_provider; 5140 mojo::ServiceProviderPtr service_provider;
5126 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5141 mojo::URLRequestPtr request(mojo::URLRequest::New());
5127 request->url = mojo::String::From(url); 5142 request->url = mojo::String::From(url);
5128 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5143 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5129 nullptr, nullptr); 5144 nullptr, nullptr);
5130 return service_provider.Pass(); 5145 return service_provider.Pass();
5131 } 5146 }
5132 5147
5133 } // namespace content 5148 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698