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

Unified Diff: chrome/browser/sync/internal_api/change_reorder_buffer.cc

Issue 7918001: [Sync] Move ChangeRecord into its own file (change_record.{h,cc}) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 9 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/internal_api/change_reorder_buffer.cc
diff --git a/chrome/browser/sync/internal_api/change_reorder_buffer.cc b/chrome/browser/sync/internal_api/change_reorder_buffer.cc
index 095ee99e70aa387fa574ec8a39deaaa77c3076ef..d030e5c2c859fa25009b5790d61022cec30b601b 100644
--- a/chrome/browser/sync/internal_api/change_reorder_buffer.cc
+++ b/chrome/browser/sync/internal_api/change_reorder_buffer.cc
@@ -121,9 +121,8 @@ ChangeReorderBuffer::ChangeReorderBuffer() {
ChangeReorderBuffer::~ChangeReorderBuffer() {
}
-void ChangeReorderBuffer::GetAllChangesInTreeOrder(
- const BaseTransaction* sync_trans,
- vector<ChangeRecord>* changelist) {
+ImmutableChangeRecordList ChangeReorderBuffer::GetAllChangesInTreeOrder(
+ const BaseTransaction* sync_trans) {
syncable::BaseTransaction* trans = sync_trans->GetWrappedTrans();
// Step 1: Iterate through the operations, doing three things:
@@ -133,6 +132,8 @@ void ChangeReorderBuffer::GetAllChangesInTreeOrder(
set<int64> parents_of_position_changes;
Traversal traversal;
+ ChangeRecordList changelist;
+
OperationMap::const_iterator i;
for (i = operations_.begin(); i != operations_.end(); ++i) {
if (i->second == OP_DELETE) {
@@ -143,7 +144,7 @@ void ChangeReorderBuffer::GetAllChangesInTreeOrder(
record.specifics = specifics_[record.id];
if (extra_data_.find(record.id) != extra_data_.end())
record.extra = extra_data_[record.id];
- changelist->push_back(record);
+ changelist.push_back(record);
} else {
traversal.ExpandToInclude(trans, i->first);
if (i->second == OP_ADD ||
@@ -181,7 +182,7 @@ void ChangeReorderBuffer::GetAllChangesInTreeOrder(
record.specifics = specifics_[record.id];
if (extra_data_.find(record.id) != extra_data_.end())
record.extra = extra_data_[record.id];
- changelist->push_back(record);
+ changelist.push_back(record);
}
// Now add the children of |next| to |to_visit|.
@@ -215,6 +216,8 @@ void ChangeReorderBuffer::GetAllChangesInTreeOrder(
}
}
}
+
+ return ImmutableChangeRecordList(&changelist);
}
} // namespace sync_api
« no previous file with comments | « chrome/browser/sync/internal_api/change_reorder_buffer.h ('k') | chrome/browser/sync/internal_api/sync_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698