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

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: Add NewFrameProxy plumbing and test 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 (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 4388 matching lines...) Expand 10 before | Expand all | Expand 10 after
4399 } 4399 }
4400 #endif 4400 #endif
4401 4401
4402 return true; 4402 return true;
4403 } 4403 }
4404 4404
4405 bool WebContentsImpl::CreateRenderFrameForRenderManager( 4405 bool WebContentsImpl::CreateRenderFrameForRenderManager(
4406 RenderFrameHost* render_frame_host, 4406 RenderFrameHost* render_frame_host,
4407 int parent_routing_id, 4407 int parent_routing_id,
4408 int previous_sibling_routing_id, 4408 int previous_sibling_routing_id,
4409 int proxy_routing_id) { 4409 int proxy_routing_id,
4410 int opener_routing_id) {
4410 TRACE_EVENT0("browser,navigation", 4411 TRACE_EVENT0("browser,navigation",
4411 "WebContentsImpl::CreateRenderFrameForRenderManager"); 4412 "WebContentsImpl::CreateRenderFrameForRenderManager");
4412 4413
4413 RenderFrameHostImpl* rfh = 4414 RenderFrameHostImpl* rfh =
4414 static_cast<RenderFrameHostImpl*>(render_frame_host); 4415 static_cast<RenderFrameHostImpl*>(render_frame_host);
4415 if (!rfh->CreateRenderFrame(parent_routing_id, previous_sibling_routing_id, 4416 if (!rfh->CreateRenderFrame(parent_routing_id, previous_sibling_routing_id,
4416 proxy_routing_id)) 4417 proxy_routing_id, opener_routing_id))
4417 return false; 4418 return false;
4418 4419
4419 // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed 4420 // TODO(nasko): When RenderWidgetHost is owned by RenderFrameHost, the passed
4420 // RenderFrameHost will have to be associated with the appropriate 4421 // RenderFrameHost will have to be associated with the appropriate
4421 // RenderWidgetHostView or a new one should be created here. 4422 // RenderWidgetHostView or a new one should be created here.
4422 4423
4423 return true; 4424 return true;
4424 } 4425 }
4425 4426
4426 #if defined(OS_ANDROID) 4427 #if defined(OS_ANDROID)
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
4615 player_map->erase(it); 4616 player_map->erase(it);
4616 } 4617 }
4617 4618
4618 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4619 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4619 force_disable_overscroll_content_ = force_disable; 4620 force_disable_overscroll_content_ = force_disable;
4620 if (view_) 4621 if (view_)
4621 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4622 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4622 } 4623 }
4623 4624
4624 } // namespace content 4625 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698