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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1312643002: Plumb opener information when creating RenderFrames and RenderFrameProxies for subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@opener-CreateOpenerProxiesIfNeeded
Patch Set: Fix param ordering in RenderThreadImpl::OnCreateNewFrameProxy 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 4377 matching lines...) Expand 10 before | Expand all | Expand 10 after
4388 if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost()) 4388 if (RenderWidgetHost* render_widget_host = rwh_view->GetRenderWidgetHost())
4389 render_widget_host->WasResized(); 4389 render_widget_host->WasResized();
4390 } 4390 }
4391 #endif 4391 #endif
4392 4392
4393 return true; 4393 return true;
4394 } 4394 }
4395 4395
4396 bool WebContentsImpl::CreateRenderFrameForRenderManager( 4396 bool WebContentsImpl::CreateRenderFrameForRenderManager(
4397 RenderFrameHost* render_frame_host, 4397 RenderFrameHost* render_frame_host,
4398 int proxy_routing_id,
4399 int opener_routing_id,
4398 int parent_routing_id, 4400 int parent_routing_id,
4399 int previous_sibling_routing_id, 4401 int previous_sibling_routing_id) {
4400 int proxy_routing_id) {
4401 TRACE_EVENT0("browser,navigation", 4402 TRACE_EVENT0("browser,navigation",
4402 "WebContentsImpl::CreateRenderFrameForRenderManager"); 4403 "WebContentsImpl::CreateRenderFrameForRenderManager");
4403 4404
4404 RenderFrameHostImpl* rfh = 4405 RenderFrameHostImpl* rfh =
4405 static_cast<RenderFrameHostImpl*>(render_frame_host); 4406 static_cast<RenderFrameHostImpl*>(render_frame_host);
4406 if (!rfh->CreateRenderFrame(parent_routing_id, previous_sibling_routing_id, 4407 if (!rfh->CreateRenderFrame(proxy_routing_id, opener_routing_id,
4407 proxy_routing_id)) 4408 parent_routing_id, previous_sibling_routing_id))
4408 return false; 4409 return false;
4409 4410
4410 // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed 4411 // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed
4411 // RenderFrameHost will have to be associated with the appropriate 4412 // RenderFrameHost will have to be associated with the appropriate
4412 // RenderWidgetHostView or a new one should be created here. 4413 // RenderWidgetHostView or a new one should be created here.
4413 4414
4414 return true; 4415 return true;
4415 } 4416 }
4416 4417
4417 #if defined(OS_ANDROID) 4418 #if defined(OS_ANDROID)
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
4621 return NULL; 4622 return NULL;
4622 } 4623 }
4623 4624
4624 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4625 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4625 force_disable_overscroll_content_ = force_disable; 4626 force_disable_overscroll_content_ = force_disable;
4626 if (view_) 4627 if (view_)
4627 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4628 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4628 } 4629 }
4629 4630
4630 } // namespace content 4631 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/frame_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698