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

Side by Side Diff: components/sync_sessions/task_tracker.cc

Issue 2868043003: Track task ids for navigations cross multiple tabs. (Closed)
Patch Set: fixing nits Created 3 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "components/sync_sessions/task_tracker.h" 5 #include "components/sync_sessions/task_tracker.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/numerics/safe_conversions.h" 9 #include "base/numerics/safe_conversions.h"
10 10
11 namespace sync_sessions { 11 namespace sync_sessions {
12 12
13 namespace { 13 namespace {
14 // The maximum number of tasks we track in a tab. 14 // The maximum number of tasks we track in a tab.
15 int kMaxNumTasksPerTab = 100; 15 int kMaxNumTasksPerTab = 100;
16 } 16 }
17 17
18 TabTasks::TabTasks() {} 18 TabTasks::TabTasks() {}
19 19
20 TabTasks::TabTasks(const TabTasks* source_tab) {
21 if (source_tab->current_navigation_index_ >= 0) {
22 std::vector<int64_t> source_tab_task_ids =
23 source_tab->GetTaskIdsForNavigation(
24 source_tab->current_navigation_index_);
25 for (auto source_tab_task_id : source_tab_task_ids)
26 task_ids_.push_back({0, source_tab_task_id});
27
28 source_tab_task_num_ = source_tab_task_ids.size();
29 }
30 }
31
20 TabTasks::~TabTasks() {} 32 TabTasks::~TabTasks() {}
21 33
22 std::vector<int64_t> TabTasks::GetTaskIdsForNavigation( 34 std::vector<int64_t> TabTasks::GetTaskIdsForNavigation(
23 int navigation_index) const { 35 int navigation_index) const {
24 CHECK_LE(0, navigation_index); 36 CHECK_LE(0, navigation_index);
25 CHECK_LT(navigation_index, GetNavigationsCount()); 37 CHECK_LT(navigation_index, GetNavigationsCount());
26 38
27 std::vector<int64_t> root_to_self_task_ids; 39 std::vector<int64_t> root_to_self_task_ids;
28 // Position of the navigation in task_ids_ vector. 40 // Position of the navigation in task_ids_ vector.
29 int navigation_position = navigation_index - excluded_navigation_num_; 41 int navigation_position =
42 GetTaskIdPositionFromNavigationIndex(navigation_index);
30 43
31 // If navigation_index is an excluded ancestor task, returns empty. 44 // If navigation_index is an excluded ancestor task, returns empty.
32 if (navigation_position < 0) 45 if (navigation_position < 0)
33 return root_to_self_task_ids; 46 return root_to_self_task_ids;
34 47
35 TaskIdAndRoot task_id_and_root = task_ids_[navigation_position]; 48 TaskIdAndRoot task_id_and_root = task_ids_[navigation_position];
36 49
37 // If navigation_index is an invalid task, returns empty. 50 // If navigation_index is an invalid task, returns empty.
38 if (task_id_and_root.root_navigation_index < 0) 51 if (task_id_and_root.root_navigation_index < 0)
39 return root_to_self_task_ids; 52 return root_to_self_task_ids;
40 53
41 // The root task can be excluded. If so, consider the oldest ancestor 54 // The root task can be excluded. If so, consider the oldest ancestor
42 // available as root. 55 // available as root.
43 int root_navigation_index = 56 int root_navigation_index =
44 task_id_and_root.root_navigation_index > excluded_navigation_num_ 57 task_id_and_root.root_navigation_index > excluded_navigation_num_
45 ? task_id_and_root.root_navigation_index - excluded_navigation_num_ 58 ? task_id_and_root.root_navigation_index - excluded_navigation_num_
46 : 0; 59 : 0;
47 for (int i = root_navigation_index; i <= navigation_position; i++) { 60 for (int i = root_navigation_index; i <= navigation_position; i++) {
48 // Fills the vector with valid tasks. 61 // Fills the vector with valid tasks.
49 if (task_ids_[i].root_navigation_index >= 0) 62 if (task_ids_[i].root_navigation_index >= 0)
50 root_to_self_task_ids.push_back(task_ids_[i].task_id); 63 root_to_self_task_ids.push_back(task_ids_[i].task_id);
51 } 64 }
52 return root_to_self_task_ids; 65 return root_to_self_task_ids;
53 } 66 }
54 67
55 int TabTasks::GetNavigationsCount() const { 68 int TabTasks::GetNavigationsCount() const {
56 return excluded_navigation_num_ + task_ids_.size(); 69 return GetNavigationIndexFromTaskIdPosition(task_ids_.size());
57 } 70 }
58 71
59 void TabTasks::UpdateWithNavigation(int navigation_index, 72 void TabTasks::UpdateWithNavigation(int navigation_index,
60 ui::PageTransition transition, 73 ui::PageTransition transition,
61 int64_t navigation_id) { 74 int64_t navigation_id) {
62 // Triggered by some notifications on the current page, do nothing. 75 // Triggered by some notifications on the current page, do nothing.
63 if (navigation_index == current_navigation_index_) { 76 if (navigation_index == current_navigation_index_) {
64 DVLOG(1) << "Doing nothing for navigation_index: " << navigation_index 77 DVLOG(1) << "Doing nothing for navigation_index: " << navigation_index
65 << " of transition: " << transition; 78 << " of transition: " << transition;
66 return; 79 return;
67 } 80 }
68 81
69 // Going back/forward to some previous navigation. 82 // Going back/forward to some previous navigation.
70 if (navigation_index < current_navigation_index_ || 83 if (navigation_index < current_navigation_index_ ||
71 (navigation_index > current_navigation_index_ && 84 (navigation_index > current_navigation_index_ &&
72 transition & ui::PAGE_TRANSITION_FORWARD_BACK && 85 transition & ui::PAGE_TRANSITION_FORWARD_BACK &&
73 base::checked_cast<size_t>(navigation_index) < task_ids_.size())) { 86 base::checked_cast<size_t>(navigation_index) < task_ids_.size())) {
74 DVLOG(1) << "Just updating task position with navigation_index: " 87 DVLOG(1) << "Just updating task position with navigation_index: "
75 << navigation_index << " of transition: " << transition; 88 << navigation_index << " of transition: " << transition;
76 current_navigation_index_ = navigation_index; 89 current_navigation_index_ = navigation_index;
77 return; 90 return;
78 } 91 }
79 92
80 // A new task for the new navigation. 93 // A new task for the new navigation.
81 int root_navigation_index = navigation_index; 94 int root_navigation_index = source_tab_task_num_ + navigation_index;
82 if (current_navigation_index_ != -1 && 95 if (ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_LINK) ||
83 (ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_LINK) || 96 ui::PageTransitionCoreTypeIs(transition,
84 ui::PageTransitionCoreTypeIs(transition, 97 ui::PAGE_TRANSITION_AUTO_SUBFRAME) ||
85 ui::PAGE_TRANSITION_AUTO_SUBFRAME) || 98 ui::PageTransitionCoreTypeIs(transition,
86 ui::PageTransitionCoreTypeIs(transition, 99 ui::PAGE_TRANSITION_MANUAL_SUBFRAME) ||
87 ui::PAGE_TRANSITION_MANUAL_SUBFRAME) || 100 ui::PageTransitionCoreTypeIs(transition,
88 ui::PageTransitionCoreTypeIs(transition, 101 ui::PAGE_TRANSITION_FORM_SUBMIT) ||
89 ui::PAGE_TRANSITION_FORM_SUBMIT) || 102 transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK) {
90 transition & ui::PAGE_TRANSITION_IS_REDIRECT_MASK)) { 103 // Creating a sub-task with navigation at current_navigation_index_ as
91 // Creating a sub-task with navigation at current_navigation_index as 104 // parent. If current_navigation_index_ == -1, the parent is the last task
92 // parent. 105 // from source tab.
93 DVLOG(1) << "Creating a sub-task with navigation_index: " 106 DVLOG(1) << "Creating a sub-task with navigation_index: "
94 << navigation_index << " of transition: " << transition 107 << navigation_index << " of transition: " << transition
95 << " under navigation_index: " << current_navigation_index_; 108 << " under navigation_index: " << current_navigation_index_;
96 // Position in task_id_. 109 // Position of current_navigation_index_ in task_id_
97 int current_navigation_position = 110 int current_navigation_position =
98 current_navigation_index_ - excluded_navigation_num_; 111 GetTaskIdPositionFromNavigationIndex(current_navigation_index_);
99 // If current/parent task is excluded, consider the new task as a root task. 112 // If current task, which is parent task of navigation_index, is excluded,
113 // consider the new task as a root task.
100 if (current_navigation_position >= 0) { 114 if (current_navigation_position >= 0) {
101 CHECK_LT(current_navigation_position, 115 CHECK_LT(current_navigation_position,
102 base::checked_cast<int>(task_ids_.size())); 116 base::checked_cast<int>(task_ids_.size()));
103 root_navigation_index = 117 root_navigation_index =
104 task_ids_[current_navigation_position].root_navigation_index; 118 task_ids_[current_navigation_position].root_navigation_index;
105 } else { 119 } else {
106 DVLOG(1) << "Becaue parent task is excluded, consider the sub-task as a " 120 DVLOG(1) << "Becaue parent task is excluded, consider the sub-task as a "
107 "root task."; 121 "root task.";
108 } 122 }
109 } else { 123 } else {
110 // Creating a root task. 124 // Creating a root task.
111 // For now, we don't consider tasks cross tabs, so first navigation of the 125 // For now, we don't consider tasks cross tabs, so first navigation of the
112 // tab always creates a root task. 126 // tab always creates a root task.
113 DVLOG(1) << "Creating a root task with navigation_index: " 127 DVLOG(1) << "Creating a root task with navigation_index: "
114 << navigation_index << " of transition: " << transition; 128 << navigation_index << " of transition: " << transition;
115 } 129 }
116 130
117 // In most cases navigation_index == excluded_navigation_num_ + 131 // In most cases navigation_index == excluded_navigation_num_ +
118 // task_ids_.size() if the previous navigation is end of chain, or 132 // task_ids_.size() - source_tab_task_num_ if the previous navigation is end
119 // navigation_index < excluded_navigation_num_ + task_ids_.size() otherwise. 133 // of chain, or navigation_index < excluded_navigation_num_ + task_ids_.size()
120 // In few case navigation_index > excluded_navigation_num_ + task_ids_.size(), 134 // otherwise. In few case navigation_index > excluded_navigation_num_ +
121 // we fill task_ids_ with invalid contents. A known case is the first 135 // task_ids_.size(), we fill task_ids_ with invalid contents. A known case is
122 // navigation after newtab. 136 // the first navigation after newtab.
123 for (int i = task_ids_.size() + excluded_navigation_num_; 137 for (int i = GetNavigationIndexFromTaskIdPosition(task_ids_.size());
124 i < navigation_index; i++) { 138 i < navigation_index; i++) {
125 task_ids_.push_back({-1, -1}); 139 task_ids_.push_back({-1, -1});
126 } 140 }
127 141
142 int new_task_id_position =
143 GetTaskIdPositionFromNavigationIndex(navigation_index);
128 // Erase all task ids associated with an outdated forward navigation stack. 144 // Erase all task ids associated with an outdated forward navigation stack.
129 if (navigation_index > excluded_navigation_num_) { 145 if (new_task_id_position > 0) {
130 int new_task_id_position = navigation_index - excluded_navigation_num_;
131 task_ids_.erase(task_ids_.begin() + new_task_id_position, task_ids_.end()); 146 task_ids_.erase(task_ids_.begin() + new_task_id_position, task_ids_.end());
132 } else { 147 } else {
133 excluded_navigation_num_ = navigation_index; 148 excluded_navigation_num_ = navigation_index + source_tab_task_num_;
134 // new task id position is 0 149 // new task id position is 0
135 task_ids_.clear(); 150 task_ids_.clear();
136 } 151 }
137 152
138 // Exclude oldest ancestors if task number reaches the limit. 153 // Exclude oldest ancestors if task number reaches the limit.
139 int more_tasks_number = task_ids_.size() + 1 - kMaxNumTasksPerTab; 154 int more_tasks_number = task_ids_.size() + 1 - kMaxNumTasksPerTab;
140 if (more_tasks_number > 0) { 155 if (more_tasks_number > 0) {
141 task_ids_.erase(task_ids_.begin(), task_ids_.begin() + more_tasks_number); 156 task_ids_.erase(task_ids_.begin(), task_ids_.begin() + more_tasks_number);
142 DVLOG(1) << "Excluding " << more_tasks_number 157 DVLOG(1) << "Excluding " << more_tasks_number
143 << " oldest ancestor(s) from navigation index " 158 << " oldest ancestor(s) from navigation index "
144 << excluded_navigation_num_; 159 << excluded_navigation_num_;
145 excluded_navigation_num_ += more_tasks_number; 160 excluded_navigation_num_ += more_tasks_number;
146 } 161 }
147 162
148 TaskIdAndRoot new_task = {root_navigation_index, navigation_id}; 163 TaskIdAndRoot new_task = {root_navigation_index, navigation_id};
149 // Add the current task at navigation_index. 164 // Add the current task at navigation_index.
150 task_ids_.push_back(new_task); 165 task_ids_.push_back(new_task);
151 current_navigation_index_ = navigation_index; 166 current_navigation_index_ = navigation_index;
152 return; 167 return;
153 } 168 }
154 169
170 int TabTasks::GetTaskIdPositionFromNavigationIndex(int navigation_index) const {
171 return source_tab_task_num_ + navigation_index - excluded_navigation_num_;
172 }
173
174 int TabTasks::GetNavigationIndexFromTaskIdPosition(int task_id_position) const {
175 return excluded_navigation_num_ + task_id_position - source_tab_task_num_;
176 }
177
155 TaskTracker::TaskTracker() {} 178 TaskTracker::TaskTracker() {}
156 179
157 TaskTracker::~TaskTracker() {} 180 TaskTracker::~TaskTracker() {}
158 181
159 TabTasks* TaskTracker::GetTabTasks(SessionID::id_type tab_id) { 182 TabTasks* TaskTracker::GetTabTasks(SessionID::id_type tab_id) {
160 if (local_tab_tasks_map_.find(tab_id) == local_tab_tasks_map_.end()) { 183 if (local_tab_tasks_map_.find(tab_id) == local_tab_tasks_map_.end()) {
161 local_tab_tasks_map_[tab_id] = base::MakeUnique<TabTasks>(); 184 local_tab_tasks_map_[tab_id] = base::MakeUnique<TabTasks>();
162 } 185 }
163 return local_tab_tasks_map_[tab_id].get(); 186 return local_tab_tasks_map_[tab_id].get();
164 } 187 }
165 188
189 TabTasks* TaskTracker::GetTabTasks(SessionID::id_type tab_id,
190 SessionID::id_type source_tab_id) {
191 if (local_tab_tasks_map_.find(tab_id) == local_tab_tasks_map_.end()) {
192 auto source_tab_iter = local_tab_tasks_map_.find(source_tab_id);
193 if (source_tab_iter != local_tab_tasks_map_.end()) {
194 local_tab_tasks_map_[tab_id] =
195 base::MakeUnique<TabTasks>(source_tab_iter->second.get());
196 } else {
197 local_tab_tasks_map_[tab_id] = base::MakeUnique<TabTasks>();
198 }
199 }
200 return local_tab_tasks_map_[tab_id].get();
201 }
202
166 void TaskTracker::CleanTabTasks(SessionID::id_type tab_id) { 203 void TaskTracker::CleanTabTasks(SessionID::id_type tab_id) {
167 auto iter = local_tab_tasks_map_.find(tab_id); 204 auto iter = local_tab_tasks_map_.find(tab_id);
168 if (iter != local_tab_tasks_map_.end()) { 205 if (iter != local_tab_tasks_map_.end()) {
169 local_tab_tasks_map_.erase(iter); 206 local_tab_tasks_map_.erase(iter);
170 } 207 }
171 } 208 }
172 209
173 } // namespace sync_sessions 210 } // namespace sync_sessions
OLDNEW
« no previous file with comments | « components/sync_sessions/task_tracker.h ('k') | components/sync_sessions/task_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698