| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 7fd3cd905b072a9fd03248d78d643e067224d8c3..12adc81857ebff47ea678d16e67f13e54a973f2d 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -669,9 +669,16 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
|
| // Ensure we start with a valid next_page_id_ from the browser.
|
| DCHECK_GE(next_page_id_, 0);
|
|
|
| + LOG(ERROR) << "RV[" << this << "]::Init:"
|
| + << " routing_id:" << routing_id_
|
| + << " main_frame:" << params.main_frame_routing_id
|
| + << " proxy:" << params.proxy_routing_id;
|
| +
|
| if (params.main_frame_routing_id != MSG_ROUTING_NONE) {
|
| main_render_frame_ = RenderFrameImpl::Create(
|
| this, params.main_frame_routing_id);
|
| + LOG(ERROR) << "RV[" << this << "]::Init:"
|
| + << " created main frame:" << main_render_frame_;
|
| // The main frame WebLocalFrame object is closed by
|
| // RenderFrameImpl::frameDetached().
|
| WebLocalFrame* web_frame = WebLocalFrame::create(
|
| @@ -692,9 +699,14 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
|
| if (command_line.HasSwitch(switches::kStatsCollectionController))
|
| stats_collection_observer_.reset(new StatsCollectionObserver(this));
|
|
|
| +
|
| +
|
| +
|
| RenderFrameProxy* proxy = NULL;
|
| if (params.proxy_routing_id != MSG_ROUTING_NONE) {
|
| CHECK(params.swapped_out);
|
| + LOG(ERROR) << "RV[" << this << "]::Init:"
|
| + << " creating proxy, main_frame:" << main_render_frame_;
|
| if (main_render_frame_) {
|
| proxy = RenderFrameProxy::CreateProxyToReplaceFrame(
|
| main_render_frame_, params.proxy_routing_id,
|
| @@ -709,8 +721,7 @@ void RenderViewImpl::Initialize(const ViewMsg_New_Params& params,
|
| }
|
| }
|
|
|
| - // In --site-per-process, just use the WebRemoteFrame as the main frame.
|
| - if (command_line.HasSwitch(switches::kSitePerProcess) && proxy) {
|
| + if (proxy) {
|
| webview()->setMainFrame(proxy->web_frame());
|
| // Initialize the WebRemoteFrame with information replicated from the
|
| // browser process.
|
|
|