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

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

Issue 107893003: Make the renderer-side prerendering code use RenderFrames instead of RenderViews. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync 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/frame_tree.h" 9 #include "content/browser/frame_host/frame_tree.h"
10 #include "content/browser/frame_host/frame_tree_node.h" 10 #include "content/browser/frame_host/frame_tree_node.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 GetProcess()->AddRoute(routing_id_, this); 51 GetProcess()->AddRoute(routing_id_, this);
52 g_routing_id_frame_map.Get().insert(std::make_pair( 52 g_routing_id_frame_map.Get().insert(std::make_pair(
53 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 53 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
54 this)); 54 this));
55 } 55 }
56 56
57 RenderFrameHostImpl::~RenderFrameHostImpl() { 57 RenderFrameHostImpl::~RenderFrameHostImpl() {
58 GetProcess()->RemoveRoute(routing_id_); 58 GetProcess()->RemoveRoute(routing_id_);
59 g_routing_id_frame_map.Get().erase( 59 g_routing_id_frame_map.Get().erase(
60 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 60 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
61 61 if (delegate_)
62 delegate_->RenderFrameDeleted(this);
62 } 63 }
63 64
64 int RenderFrameHostImpl::GetRoutingID() { 65 int RenderFrameHostImpl::GetRoutingID() {
65 return routing_id_; 66 return routing_id_;
66 } 67 }
67 68
68 bool RenderFrameHostImpl::Send(IPC::Message* message) { 69 bool RenderFrameHostImpl::Send(IPC::Message* message) {
69 return GetProcess()->Send(message); 70 return GetProcess()->Send(message);
70 } 71 }
71 72
(...skipping 26 matching lines...) Expand all
98 RenderProcessHost* RenderFrameHostImpl::GetProcess() const { 99 RenderProcessHost* RenderFrameHostImpl::GetProcess() const {
99 // TODO(nasko): This should return its own process, once we have working 100 // TODO(nasko): This should return its own process, once we have working
100 // cross-process navigation for subframes. 101 // cross-process navigation for subframes.
101 return render_view_host_->GetProcess(); 102 return render_view_host_->GetProcess();
102 } 103 }
103 104
104 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id, 105 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id,
105 int64 parent_frame_id, 106 int64 parent_frame_id,
106 int64 frame_id, 107 int64 frame_id,
107 const std::string& frame_name) { 108 const std::string& frame_name) {
108 frame_tree_->AddFrame(new_frame_routing_id, parent_frame_id, frame_id, 109 RenderFrameHostImpl* new_frame = frame_tree_->AddFrame(
109 frame_name); 110 new_frame_routing_id, parent_frame_id, frame_id, frame_name);
111 if (delegate_)
112 delegate_->RenderFrameCreated(new_frame);
110 } 113 }
111 114
112 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) { 115 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) {
113 frame_tree_->RemoveFrame(this, parent_frame_id, frame_id); 116 frame_tree_->RemoveFrame(this, parent_frame_id, frame_id);
114 } 117 }
115 118
116 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 119 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
117 int64 frame_id, 120 int64 frame_id,
118 int64 parent_frame_id, 121 int64 parent_frame_id,
119 bool is_main_frame, 122 bool is_main_frame,
120 const GURL& url) { 123 const GURL& url) {
121 frame_tree_node_->navigator()->DidStartProvisionalLoad( 124 frame_tree_node_->navigator()->DidStartProvisionalLoad(
122 this, frame_id, parent_frame_id, is_main_frame, url); 125 this, frame_id, parent_frame_id, is_main_frame, url);
123 } 126 }
124 127
125 } // namespace content 128 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_delegate.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698