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

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 to head 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/render_frame_host_delegate.h" 10 #include "content/browser/frame_host/render_frame_host_delegate.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 GetProcess()->AddRoute(routing_id_, this); 47 GetProcess()->AddRoute(routing_id_, this);
48 g_routing_id_frame_map.Get().insert(std::make_pair( 48 g_routing_id_frame_map.Get().insert(std::make_pair(
49 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 49 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
50 this)); 50 this));
51 } 51 }
52 52
53 RenderFrameHostImpl::~RenderFrameHostImpl() { 53 RenderFrameHostImpl::~RenderFrameHostImpl() {
54 GetProcess()->RemoveRoute(routing_id_); 54 GetProcess()->RemoveRoute(routing_id_);
55 g_routing_id_frame_map.Get().erase( 55 g_routing_id_frame_map.Get().erase(
56 RenderFrameHostID(GetProcess()->GetID(), routing_id_)); 56 RenderFrameHostID(GetProcess()->GetID(), routing_id_));
57 57 if (delegate_)
58 delegate_->RenderFrameDeleted(this);
58 } 59 }
59 60
60 int RenderFrameHostImpl::GetRoutingID() { 61 int RenderFrameHostImpl::GetRoutingID() {
61 return routing_id_; 62 return routing_id_;
62 } 63 }
63 64
64 bool RenderFrameHostImpl::Send(IPC::Message* message) { 65 bool RenderFrameHostImpl::Send(IPC::Message* message) {
65 return GetProcess()->Send(message); 66 return GetProcess()->Send(message);
66 } 67 }
67 68
(...skipping 26 matching lines...) Expand all
94 RenderProcessHost* RenderFrameHostImpl::GetProcess() const { 95 RenderProcessHost* RenderFrameHostImpl::GetProcess() const {
95 // TODO(nasko): This should return its own process, once we have working 96 // TODO(nasko): This should return its own process, once we have working
96 // cross-process navigation for subframes. 97 // cross-process navigation for subframes.
97 return render_view_host_->GetProcess(); 98 return render_view_host_->GetProcess();
98 } 99 }
99 100
100 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id, 101 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id,
101 int64 parent_frame_id, 102 int64 parent_frame_id,
102 int64 frame_id, 103 int64 frame_id,
103 const std::string& frame_name) { 104 const std::string& frame_name) {
104 frame_tree_->AddFrame(new_frame_routing_id, parent_frame_id, frame_id, 105 RenderFrameHostImpl* new_frame = frame_tree_->AddFrame(
105 frame_name); 106 new_frame_routing_id, parent_frame_id, frame_id, frame_name);
107 if (delegate_)
108 delegate_->RenderFrameCreated(new_frame);
106 } 109 }
107 110
108 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) { 111 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) {
109 frame_tree_->RemoveFrame(parent_frame_id, frame_id); 112 frame_tree_->RemoveFrame(parent_frame_id, frame_id);
110 } 113 }
111 114
112 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 115 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
113 int64 frame_id, 116 int64 frame_id,
114 int64 parent_frame_id, 117 int64 parent_frame_id,
115 bool is_main_frame, 118 bool is_main_frame,
116 const GURL& url) { 119 const GURL& url) {
117 render_view_host_->OnDidStartProvisionalLoadForFrame( 120 render_view_host_->OnDidStartProvisionalLoadForFrame(
118 frame_id, parent_frame_id, is_main_frame, url); 121 frame_id, parent_frame_id, is_main_frame, url);
119 } 122 }
120 123
121 } // namespace content 124 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698