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

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

Issue 1093923003: Change FrameTreeNode id from int64 to int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change FrameTreeNode id from int64 to int Created 5 years, 7 months 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
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/command_line.h" 9 #include "base/command_line.h"
10 #include "base/profiler/scoped_tracker.h" 10 #include "base/profiler/scoped_tracker.h"
11 #include "base/stl_util.h" 11 #include "base/stl_util.h"
12 #include "content/browser/frame_host/frame_tree.h" 12 #include "content/browser/frame_host/frame_tree.h"
13 #include "content/browser/frame_host/navigation_request.h" 13 #include "content/browser/frame_host/navigation_request.h"
14 #include "content/browser/frame_host/navigator.h" 14 #include "content/browser/frame_host/navigator.h"
15 #include "content/browser/frame_host/render_frame_host_impl.h" 15 #include "content/browser/frame_host/render_frame_host_impl.h"
16 #include "content/browser/renderer_host/render_view_host_impl.h" 16 #include "content/browser/renderer_host/render_view_host_impl.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "content/public/common/content_switches.h" 18 #include "content/public/common/content_switches.h"
19 19
20 namespace content { 20 namespace content {
21 21
22 namespace { 22 namespace {
23 23
24 // This is a global map between frame_tree_node_ids and pointers to 24 // This is a global map between frame_tree_node_ids and pointers to
25 // FrameTreeNodes. 25 // FrameTreeNodes.
26 typedef base::hash_map<int64, FrameTreeNode*> FrameTreeNodeIDMap; 26 typedef base::hash_map<int, FrameTreeNode*> FrameTreeNodeIDMap;
27 27
28 base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map = 28 base::LazyInstance<FrameTreeNodeIDMap> g_frame_tree_node_id_map =
29 LAZY_INSTANCE_INITIALIZER; 29 LAZY_INSTANCE_INITIALIZER;
30 30
31 // These values indicate the loading progress status. The minimum progress 31 // These values indicate the loading progress status. The minimum progress
32 // value matches what Blink's ProgressTracker has traditionally used for a 32 // value matches what Blink's ProgressTracker has traditionally used for a
33 // minimum progress value. 33 // minimum progress value.
34 const double kLoadingProgressNotStarted = 0.0; 34 const double kLoadingProgressNotStarted = 0.0;
35 const double kLoadingProgressMinimum = 0.1; 35 const double kLoadingProgressMinimum = 0.1;
36 const double kLoadingProgressDone = 1.0; 36 const double kLoadingProgressDone = 1.0;
37 37
38 } // namespace 38 } // namespace
39 39
40 int64 FrameTreeNode::next_frame_tree_node_id_ = 1; 40 int FrameTreeNode::next_frame_tree_node_id_ = 1;
41 41
42 // static 42 // static
43 FrameTreeNode* FrameTreeNode::GloballyFindByID(int64 frame_tree_node_id) { 43 FrameTreeNode* FrameTreeNode::GloballyFindByID(int frame_tree_node_id) {
44 DCHECK_CURRENTLY_ON(BrowserThread::UI); 44 DCHECK_CURRENTLY_ON(BrowserThread::UI);
45 FrameTreeNodeIDMap* nodes = g_frame_tree_node_id_map.Pointer(); 45 FrameTreeNodeIDMap* nodes = g_frame_tree_node_id_map.Pointer();
46 FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id); 46 FrameTreeNodeIDMap::iterator it = nodes->find(frame_tree_node_id);
47 return it == nodes->end() ? nullptr : it->second; 47 return it == nodes->end() ? nullptr : it->second;
48 } 48 }
49 49
50 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree, 50 FrameTreeNode::FrameTreeNode(FrameTree* frame_tree,
51 Navigator* navigator, 51 Navigator* navigator,
52 RenderFrameHostDelegate* render_frame_delegate, 52 RenderFrameHostDelegate* render_frame_delegate,
53 RenderViewHostDelegate* render_view_delegate, 53 RenderViewHostDelegate* render_view_delegate,
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 FROM_HERE_WITH_EXPLICIT_FUNCTION( 262 FROM_HERE_WITH_EXPLICIT_FUNCTION(
263 "465796 FrameTreeNode::DidStopLoading::End")); 263 "465796 FrameTreeNode::DidStopLoading::End"));
264 } 264 }
265 265
266 void FrameTreeNode::DidChangeLoadProgress(double load_progress) { 266 void FrameTreeNode::DidChangeLoadProgress(double load_progress) {
267 loading_progress_ = load_progress; 267 loading_progress_ = load_progress;
268 frame_tree_->UpdateLoadProgress(); 268 frame_tree_->UpdateLoadProgress();
269 } 269 }
270 270
271 } // namespace content 271 } // 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