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

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: WIP snapshot with major comment rewrite. 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 18 matching lines...) Expand all
37 38
38 RenderFrameHostImpl::RenderFrameHostImpl( 39 RenderFrameHostImpl::RenderFrameHostImpl(
39 RenderViewHostImpl* render_view_host, 40 RenderViewHostImpl* render_view_host,
40 RenderFrameHostDelegate* delegate, 41 RenderFrameHostDelegate* delegate,
41 FrameTree* frame_tree, 42 FrameTree* frame_tree,
42 FrameTreeNode* frame_tree_node, 43 FrameTreeNode* frame_tree_node,
43 int routing_id, 44 int routing_id,
44 bool is_swapped_out) 45 bool is_swapped_out)
45 : render_view_host_(render_view_host), 46 : render_view_host_(render_view_host),
46 delegate_(delegate), 47 delegate_(delegate),
48 cross_process_frame_connector_(NULL),
47 frame_tree_(frame_tree), 49 frame_tree_(frame_tree),
48 frame_tree_node_(frame_tree_node), 50 frame_tree_node_(frame_tree_node),
49 routing_id_(routing_id), 51 routing_id_(routing_id),
50 is_swapped_out_(is_swapped_out) { 52 is_swapped_out_(is_swapped_out) {
51 GetProcess()->AddRoute(routing_id_, this); 53 GetProcess()->AddRoute(routing_id_, this);
52 g_routing_id_frame_map.Get().insert(std::make_pair( 54 g_routing_id_frame_map.Get().insert(std::make_pair(
53 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 55 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
54 this)); 56 this));
55 } 57 }
56 58
57 RenderFrameHostImpl::~RenderFrameHostImpl() { 59 RenderFrameHostImpl::~RenderFrameHostImpl() {
58 GetProcess()->RemoveRoute(routing_id_); 60 GetProcess()->RemoveRoute(routing_id_);
59 g_routing_id_frame_map.Get().erase( 61 g_routing_id_frame_map.Get().erase(
60 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 62 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
61 if (delegate_) 63 if (delegate_)
62 delegate_->RenderFrameDeleted(this); 64 delegate_->RenderFrameDeleted(this);
63 } 65 }
64 66
65 int RenderFrameHostImpl::GetRoutingID() { 67 int RenderFrameHostImpl::GetRoutingID() {
66 return routing_id_; 68 return routing_id_;
67 } 69 }
68 70
71 void RenderFrameHostImpl::SetCrossProcessFrameConnector(
72 CrossProcessFrameConnector* cross_process_frame_connector) {
73 cross_process_frame_connector_ = cross_process_frame_connector;
Charlie Reis 2013/12/17 01:09:31 This is simple and can be inlined in the .h file,
awong 2013/12/17 02:45:27 Done.
74 }
75
69 bool RenderFrameHostImpl::Send(IPC::Message* message) { 76 bool RenderFrameHostImpl::Send(IPC::Message* message) {
70 return GetProcess()->Send(message); 77 return GetProcess()->Send(message);
71 } 78 }
72 79
73 bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { 80 bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
74 if (delegate_->OnMessageReceived(this, msg)) 81 if (delegate_->OnMessageReceived(this, msg))
75 return true; 82 return true;
76 83
77 bool handled = true; 84 bool handled = true;
78 bool msg_is_ok = true; 85 bool msg_is_ok = true;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 126 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
120 int64 frame_id, 127 int64 frame_id,
121 int64 parent_frame_id, 128 int64 parent_frame_id,
122 bool is_main_frame, 129 bool is_main_frame,
123 const GURL& url) { 130 const GURL& url) {
124 frame_tree_node_->navigator()->DidStartProvisionalLoad( 131 frame_tree_node_->navigator()->DidStartProvisionalLoad(
125 this, frame_id, parent_frame_id, is_main_frame, url); 132 this, frame_id, parent_frame_id, is_main_frame, url);
126 } 133 }
127 134
128 } // namespace content 135 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698