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

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: Tweaked a comment 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/render_frame_host_delegate.h" 11 #include "content/browser/frame_host/render_frame_host_delegate.h"
11 #include "content/browser/renderer_host/render_view_host_impl.h" 12 #include "content/browser/renderer_host/render_view_host_impl.h"
12 #include "content/common/frame_messages.h" 13 #include "content/common/frame_messages.h"
13 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
15 #include "content/public/browser/user_metrics.h" 16 #include "content/public/browser/user_metrics.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 18
18 namespace content { 19 namespace content {
(...skipping 15 matching lines...) Expand all
34 } 35 }
35 36
36 RenderFrameHostImpl::RenderFrameHostImpl( 37 RenderFrameHostImpl::RenderFrameHostImpl(
37 RenderViewHostImpl* render_view_host, 38 RenderViewHostImpl* render_view_host,
38 RenderFrameHostDelegate* delegate, 39 RenderFrameHostDelegate* delegate,
39 FrameTree* frame_tree, 40 FrameTree* frame_tree,
40 int routing_id, 41 int routing_id,
41 bool is_swapped_out) 42 bool is_swapped_out)
42 : render_view_host_(render_view_host), 43 : render_view_host_(render_view_host),
43 delegate_(delegate), 44 delegate_(delegate),
45 cross_process_frame_connector_(0),
nasko 2013/12/16 23:16:32 nit: Use NULL instead of 0, which is the Chromium
awong 2013/12/17 02:45:27 Done.
44 frame_tree_(frame_tree), 46 frame_tree_(frame_tree),
45 routing_id_(routing_id), 47 routing_id_(routing_id),
46 is_swapped_out_(is_swapped_out) { 48 is_swapped_out_(is_swapped_out) {
47 GetProcess()->AddRoute(routing_id_, this); 49 GetProcess()->AddRoute(routing_id_, this);
48 g_routing_id_frame_map.Get().insert(std::make_pair( 50 g_routing_id_frame_map.Get().insert(std::make_pair(
49 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 51 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
50 this)); 52 this));
51 } 53 }
52 54
53 RenderFrameHostImpl::~RenderFrameHostImpl() { 55 RenderFrameHostImpl::~RenderFrameHostImpl() {
54 GetProcess()->RemoveRoute(routing_id_); 56 GetProcess()->RemoveRoute(routing_id_);
55 g_routing_id_frame_map.Get().erase( 57 g_routing_id_frame_map.Get().erase(
56 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 58 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
57 59
58 } 60 }
59 61
60 int RenderFrameHostImpl::GetRoutingID() { 62 int RenderFrameHostImpl::GetRoutingID() {
61 return routing_id_; 63 return routing_id_;
62 } 64 }
63 65
66 void RenderFrameHostImpl::SetCrossProcessFrameConnector(
67 CrossProcessFrameConnector* cross_process_frame_connector) {
68 cross_process_frame_connector_ = cross_process_frame_connector;
69 }
70
64 bool RenderFrameHostImpl::Send(IPC::Message* message) { 71 bool RenderFrameHostImpl::Send(IPC::Message* message) {
65 return GetProcess()->Send(message); 72 return GetProcess()->Send(message);
66 } 73 }
67 74
68 bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { 75 bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
69 if (delegate_->OnMessageReceived(this, msg)) 76 if (delegate_->OnMessageReceived(this, msg))
70 return true; 77 return true;
71 78
72 bool handled = true; 79 bool handled = true;
73 bool msg_is_ok = true; 80 bool msg_is_ok = true;
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 119 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
113 int64 frame_id, 120 int64 frame_id,
114 int64 parent_frame_id, 121 int64 parent_frame_id,
115 bool is_main_frame, 122 bool is_main_frame,
116 const GURL& url) { 123 const GURL& url) {
117 render_view_host_->OnDidStartProvisionalLoadForFrame( 124 render_view_host_->OnDidStartProvisionalLoadForFrame(
118 frame_id, parent_frame_id, is_main_frame, url); 125 frame_id, parent_frame_id, is_main_frame, url);
119 } 126 }
120 127
121 } // namespace content 128 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698