OLD | NEW |
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/frame_tree.h" | 9 #include "content/browser/frame_host/frame_tree.h" |
10 #include "content/browser/renderer_host/render_view_host_impl.h" | 10 #include "content/browser/renderer_host/render_view_host_impl.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 | 33 |
34 RenderFrameHostImpl::RenderFrameHostImpl( | 34 RenderFrameHostImpl::RenderFrameHostImpl( |
35 RenderViewHostImpl* render_view_host, | 35 RenderViewHostImpl* render_view_host, |
36 FrameTree* frame_tree, | 36 FrameTree* frame_tree, |
37 int routing_id, | 37 int routing_id, |
38 bool is_swapped_out) | 38 bool is_swapped_out) |
39 : render_view_host_(render_view_host), | 39 : render_view_host_(render_view_host), |
40 frame_tree_(frame_tree), | 40 frame_tree_(frame_tree), |
41 routing_id_(routing_id), | 41 routing_id_(routing_id), |
42 is_swapped_out_(is_swapped_out) { | 42 is_swapped_out_(is_swapped_out) { |
| 43 LOG(INFO) << "NEW RenderFrameHostImpl: process " << GetProcess()->GetID() << |
| 44 ", route " << routing_id_; |
43 GetProcess()->AddRoute(routing_id_, this); | 45 GetProcess()->AddRoute(routing_id_, this); |
44 g_routing_id_frame_map.Get().insert(std::make_pair( | 46 g_routing_id_frame_map.Get().insert(std::make_pair( |
45 RenderFrameHostID(GetProcess()->GetID(), routing_id_), | 47 RenderFrameHostID(GetProcess()->GetID(), routing_id_), |
46 this)); | 48 this)); |
47 } | 49 } |
48 | 50 |
49 RenderFrameHostImpl::~RenderFrameHostImpl() { | 51 RenderFrameHostImpl::~RenderFrameHostImpl() { |
50 GetProcess()->RemoveRoute(routing_id_); | 52 GetProcess()->RemoveRoute(routing_id_); |
51 g_routing_id_frame_map.Get().erase( | 53 g_routing_id_frame_map.Get().erase( |
52 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); | 54 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); |
(...skipping 23 matching lines...) Expand all Loading... |
76 RenderProcessHost* RenderFrameHostImpl::GetProcess() const { | 78 RenderProcessHost* RenderFrameHostImpl::GetProcess() const { |
77 // TODO(nasko): This should return its own process, once we have working | 79 // TODO(nasko): This should return its own process, once we have working |
78 // cross-process navigation for subframes. | 80 // cross-process navigation for subframes. |
79 return render_view_host_->GetProcess(); | 81 return render_view_host_->GetProcess(); |
80 } | 82 } |
81 | 83 |
82 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id, | 84 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id, |
83 int64 parent_frame_id, | 85 int64 parent_frame_id, |
84 int64 frame_id, | 86 int64 frame_id, |
85 const std::string& frame_name) { | 87 const std::string& frame_name) { |
86 frame_tree_->AddFrame(new_frame_routing_id, parent_frame_id, frame_id, | 88 frame_tree_->AddFrame(render_view_host(), new_frame_routing_id, |
87 frame_name); | 89 parent_frame_id, frame_id, frame_name); |
88 } | 90 } |
89 | 91 |
90 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) { | 92 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) { |
91 frame_tree_->RemoveFrame(parent_frame_id, frame_id); | 93 frame_tree_->RemoveFrame( |
| 94 render_view_host()->GetFrameTreeNodeID(parent_frame_id), |
| 95 render_view_host()->GetFrameTreeNodeID(frame_id)); |
92 } | 96 } |
93 | 97 |
94 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( | 98 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( |
95 int64 frame_id, | 99 int64 frame_id, |
96 int64 parent_frame_id, | 100 int64 parent_frame_id, |
97 bool is_main_frame, | 101 bool is_main_frame, |
98 const GURL& url) { | 102 const GURL& url) { |
99 render_view_host_->OnDidStartProvisionalLoadForFrame( | 103 render_view_host_->OnDidStartProvisionalLoadForFrame( |
100 frame_id, parent_frame_id, is_main_frame, url); | 104 frame_id, parent_frame_id, is_main_frame, url); |
101 } | 105 } |
102 | 106 |
103 } // namespace content | 107 } // namespace content |
OLD | NEW |