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

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

Issue 72233002: Move RenderViewHostManager from WebContents to FrameTreeNode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 7 years, 1 month 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/frame_tree_node.h" 5 #include "content/browser/frame_host/frame_tree_node.h"
6 6
7 #include <queue> 7 #include <queue>
8 8
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "content/browser/frame_host/navigator.h" 10 #include "content/browser/frame_host/navigator.h"
11 #include "content/browser/frame_host/render_frame_host_impl.h" 11 #include "content/browser/frame_host/render_frame_host_impl.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 const int64 FrameTreeNode::kInvalidFrameId = -1; 15 const int64 FrameTreeNode::kInvalidFrameId = -1;
16 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; 16 int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
17 17
18 FrameTreeNode::FrameTreeNode( 18 FrameTreeNode::FrameTreeNode(Navigator* navigator,
19 int64 frame_id, 19 RenderViewHostDelegate* render_view_delegate,
20 const std::string& name, 20 RenderWidgetHostDelegate* render_widget_delegate,
21 Navigator* navigator, 21 RenderViewHostManager::Delegate* manager_delegate,
22 scoped_ptr<RenderFrameHostImpl> render_frame_host) 22 int64 frame_id,
23 : frame_tree_node_id_(next_frame_tree_node_id_++), 23 const std::string& name,
24 scoped_ptr<RenderFrameHostImpl> render_frame_host)
25 : navigator_(navigator),
26 render_manager_(render_view_delegate,
27 render_widget_delegate,
28 manager_delegate),
29 frame_tree_node_id_(next_frame_tree_node_id_++),
24 frame_id_(frame_id), 30 frame_id_(frame_id),
25 frame_name_(name), 31 frame_name_(name),
26 navigator_(navigator),
27 owns_render_frame_host_(true), 32 owns_render_frame_host_(true),
28 render_frame_host_(render_frame_host.release()) { 33 render_frame_host_(render_frame_host.release()) {
29 } 34 }
30 35
31 FrameTreeNode::~FrameTreeNode() { 36 FrameTreeNode::~FrameTreeNode() {
32 if (owns_render_frame_host_) 37 if (owns_render_frame_host_)
33 delete render_frame_host_; 38 delete render_frame_host_;
34 } 39 }
35 40
36 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) { 41 void FrameTreeNode::AddChild(scoped_ptr<FrameTreeNode> child) {
(...skipping 18 matching lines...) Expand all
55 60
56 owns_render_frame_host_ = false; 61 owns_render_frame_host_ = false;
57 frame_id_ = kInvalidFrameId; 62 frame_id_ = kInvalidFrameId;
58 current_url_ = GURL(); 63 current_url_ = GURL();
59 children_.clear(); 64 children_.clear();
60 65
61 render_frame_host_ = new_render_frame_host; 66 render_frame_host_ = new_render_frame_host;
62 } 67 }
63 68
64 } // namespace content 69 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_node.h ('k') | content/browser/frame_host/frame_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698