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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 100473010: Adding RenderWidgetHostViewChildFrame for OOPIF view. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comment. also squished change locally. Created 7 years 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 | Annotate | Revision Log
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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "content/browser/frame_host/cross_process_frame_connector.h"
9 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
10 #include "content/browser/frame_host/frame_tree_node.h" 11 #include "content/browser/frame_host/frame_tree_node.h"
11 #include "content/browser/frame_host/navigator.h" 12 #include "content/browser/frame_host/navigator.h"
12 #include "content/browser/frame_host/render_frame_host_delegate.h" 13 #include "content/browser/frame_host/render_frame_host_delegate.h"
13 #include "content/browser/renderer_host/render_view_host_impl.h" 14 #include "content/browser/renderer_host/render_view_host_impl.h"
14 #include "content/common/frame_messages.h" 15 #include "content/common/frame_messages.h"
15 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/render_process_host.h" 17 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/user_metrics.h" 18 #include "content/public/browser/user_metrics.h"
18 #include "url/gurl.h" 19 #include "url/gurl.h"
(...skipping 24 matching lines...) Expand all
43 44
44 RenderFrameHostImpl::RenderFrameHostImpl( 45 RenderFrameHostImpl::RenderFrameHostImpl(
45 RenderViewHostImpl* render_view_host, 46 RenderViewHostImpl* render_view_host,
46 RenderFrameHostDelegate* delegate, 47 RenderFrameHostDelegate* delegate,
47 FrameTree* frame_tree, 48 FrameTree* frame_tree,
48 FrameTreeNode* frame_tree_node, 49 FrameTreeNode* frame_tree_node,
49 int routing_id, 50 int routing_id,
50 bool is_swapped_out) 51 bool is_swapped_out)
51 : render_view_host_(render_view_host), 52 : render_view_host_(render_view_host),
52 delegate_(delegate), 53 delegate_(delegate),
54 cross_process_frame_connector_(NULL),
53 frame_tree_(frame_tree), 55 frame_tree_(frame_tree),
54 frame_tree_node_(frame_tree_node), 56 frame_tree_node_(frame_tree_node),
55 routing_id_(routing_id), 57 routing_id_(routing_id),
56 is_swapped_out_(is_swapped_out) { 58 is_swapped_out_(is_swapped_out) {
57 frame_tree_->RegisterRenderFrameHost(this); 59 frame_tree_->RegisterRenderFrameHost(this);
58 GetProcess()->AddRoute(routing_id_, this); 60 GetProcess()->AddRoute(routing_id_, this);
59 g_routing_id_frame_map.Get().insert(std::make_pair( 61 g_routing_id_frame_map.Get().insert(std::make_pair(
60 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 62 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
61 this)); 63 this));
62 } 64 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 132 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
131 int64 frame_id, 133 int64 frame_id,
132 int64 parent_frame_id, 134 int64 parent_frame_id,
133 bool is_main_frame, 135 bool is_main_frame,
134 const GURL& url) { 136 const GURL& url) {
135 frame_tree_node_->navigator()->DidStartProvisionalLoad( 137 frame_tree_node_->navigator()->DidStartProvisionalLoad(
136 this, frame_id, parent_frame_id, is_main_frame, url); 138 this, frame_id, parent_frame_id, is_main_frame, url);
137 } 139 }
138 140
139 } // namespace content 141 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698