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

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

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove DCHECK, hits too often in unit tests. 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"
11 #include "content/browser/frame_host/navigator.h"
10 #include "content/browser/frame_host/render_frame_host_delegate.h" 12 #include "content/browser/frame_host/render_frame_host_delegate.h"
11 #include "content/browser/renderer_host/render_view_host_impl.h" 13 #include "content/browser/renderer_host/render_view_host_impl.h"
12 #include "content/common/frame_messages.h" 14 #include "content/common/frame_messages.h"
13 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/site_instance.h"
Charlie Reis 2013/12/10 01:20:51 No longer needed?
nasko 2013/12/10 01:36:50 Done.
15 #include "content/public/browser/user_metrics.h" 18 #include "content/public/browser/user_metrics.h"
16 #include "url/gurl.h" 19 #include "url/gurl.h"
17 20
18 namespace content { 21 namespace content {
19 22
20 // The (process id, routing id) pair that identifies one RenderFrame. 23 // The (process id, routing id) pair that identifies one RenderFrame.
21 typedef std::pair<int32, int32> RenderFrameHostID; 24 typedef std::pair<int32, int32> RenderFrameHostID;
22 typedef base::hash_map<RenderFrameHostID, RenderFrameHostImpl*> 25 typedef base::hash_map<RenderFrameHostID, RenderFrameHostImpl*>
23 RoutingIDFrameMap; 26 RoutingIDFrameMap;
24 static base::LazyInstance<RoutingIDFrameMap> g_routing_id_frame_map = 27 static base::LazyInstance<RoutingIDFrameMap> g_routing_id_frame_map =
25 LAZY_INSTANCE_INITIALIZER; 28 LAZY_INSTANCE_INITIALIZER;
26 29
27 // static 30 // static
28 RenderFrameHostImpl* RenderFrameHostImpl::FromID( 31 RenderFrameHostImpl* RenderFrameHostImpl::FromID(
29 int process_id, int routing_id) { 32 int process_id, int routing_id) {
30 RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer(); 33 RoutingIDFrameMap* frames = g_routing_id_frame_map.Pointer();
31 RoutingIDFrameMap::iterator it = frames->find( 34 RoutingIDFrameMap::iterator it = frames->find(
32 RenderFrameHostID(process_id, routing_id)); 35 RenderFrameHostID(process_id, routing_id));
33 return it == frames->end() ? NULL : it->second; 36 return it == frames->end() ? NULL : it->second;
34 } 37 }
35 38
36 RenderFrameHostImpl::RenderFrameHostImpl( 39 RenderFrameHostImpl::RenderFrameHostImpl(
37 RenderViewHostImpl* render_view_host, 40 RenderViewHostImpl* render_view_host,
38 RenderFrameHostDelegate* delegate, 41 RenderFrameHostDelegate* delegate,
39 FrameTree* frame_tree, 42 FrameTree* frame_tree,
43 FrameTreeNode* frame_tree_node,
40 int routing_id, 44 int routing_id,
41 bool is_swapped_out) 45 bool is_swapped_out)
42 : render_view_host_(render_view_host), 46 : render_view_host_(render_view_host),
43 delegate_(delegate), 47 delegate_(delegate),
44 frame_tree_(frame_tree), 48 frame_tree_(frame_tree),
49 frame_tree_node_(frame_tree_node),
45 routing_id_(routing_id), 50 routing_id_(routing_id),
46 is_swapped_out_(is_swapped_out) { 51 is_swapped_out_(is_swapped_out) {
47 GetProcess()->AddRoute(routing_id_, this); 52 GetProcess()->AddRoute(routing_id_, this);
48 g_routing_id_frame_map.Get().insert(std::make_pair( 53 g_routing_id_frame_map.Get().insert(std::make_pair(
49 RenderFrameHostID(GetProcess()->GetID(), routing_id_), 54 RenderFrameHostID(GetProcess()->GetID(), routing_id_),
50 this)); 55 this));
51 } 56 }
52 57
53 RenderFrameHostImpl::~RenderFrameHostImpl() { 58 RenderFrameHostImpl::~RenderFrameHostImpl() {
54 GetProcess()->RemoveRoute(routing_id_); 59 GetProcess()->RemoveRoute(routing_id_);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 104
100 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id, 105 void RenderFrameHostImpl::OnCreateChildFrame(int new_frame_routing_id,
101 int64 parent_frame_id, 106 int64 parent_frame_id,
102 int64 frame_id, 107 int64 frame_id,
103 const std::string& frame_name) { 108 const std::string& frame_name) {
104 frame_tree_->AddFrame(new_frame_routing_id, parent_frame_id, frame_id, 109 frame_tree_->AddFrame(new_frame_routing_id, parent_frame_id, frame_id,
105 frame_name); 110 frame_name);
106 } 111 }
107 112
108 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) { 113 void RenderFrameHostImpl::OnDetach(int64 parent_frame_id, int64 frame_id) {
109 frame_tree_->RemoveFrame(parent_frame_id, frame_id); 114 frame_tree_->RemoveFrame(this, parent_frame_id, frame_id);
110 } 115 }
111 116
112 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame( 117 void RenderFrameHostImpl::OnDidStartProvisionalLoadForFrame(
113 int64 frame_id, 118 int64 frame_id,
114 int64 parent_frame_id, 119 int64 parent_frame_id,
115 bool is_main_frame, 120 bool is_main_frame,
116 const GURL& url) { 121 const GURL& url) {
117 render_view_host_->OnDidStartProvisionalLoadForFrame( 122 frame_tree_node_->navigator()->DidStartProvisionalLoad(
118 frame_id, parent_frame_id, is_main_frame, url); 123 this, frame_id, parent_frame_id, is_main_frame, url);
119 } 124 }
120 125
121 } // namespace content 126 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698