| OLD | NEW |
| 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 "sync/syncable/directory.h" | 5 #include "sync/syncable/directory.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 // Add the position index if appropriate. This must be done here (and not | 1168 // Add the position index if appropriate. This must be done here (and not |
| 1169 // in EntryKernel) because the EntryKernel does not have access to its | 1169 // in EntryKernel) because the EntryKernel does not have access to its |
| 1170 // siblings. | 1170 // siblings. |
| 1171 if (kernel->ShouldMaintainPosition() && !kernel->ref(IS_DEL)) { | 1171 if (kernel->ShouldMaintainPosition() && !kernel->ref(IS_DEL)) { |
| 1172 node->SetInteger("positionIndex", GetPositionIndex(trans, kernel)); | 1172 node->SetInteger("positionIndex", GetPositionIndex(trans, kernel)); |
| 1173 } | 1173 } |
| 1174 | 1174 |
| 1175 nodes->Append(node.release()); | 1175 nodes->Append(node.release()); |
| 1176 } | 1176 } |
| 1177 | 1177 |
| 1178 return nodes.Pass(); | 1178 return nodes; |
| 1179 } | 1179 } |
| 1180 | 1180 |
| 1181 bool Directory::CheckInvariantsOnTransactionClose( | 1181 bool Directory::CheckInvariantsOnTransactionClose( |
| 1182 syncable::BaseTransaction* trans, | 1182 syncable::BaseTransaction* trans, |
| 1183 const MetahandleSet& modified_handles) { | 1183 const MetahandleSet& modified_handles) { |
| 1184 // NOTE: The trans may be in the process of being destructed. Be careful if | 1184 // NOTE: The trans may be in the process of being destructed. Be careful if |
| 1185 // you wish to call any of its virtual methods. | 1185 // you wish to call any of its virtual methods. |
| 1186 switch (invariant_check_level_) { | 1186 switch (invariant_check_level_) { |
| 1187 case FULL_DB_VERIFICATION: { | 1187 case FULL_DB_VERIFICATION: { |
| 1188 MetahandleSet all_handles; | 1188 MetahandleSet all_handles; |
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1593 Directory::Kernel* Directory::kernel() { | 1593 Directory::Kernel* Directory::kernel() { |
| 1594 return kernel_; | 1594 return kernel_; |
| 1595 } | 1595 } |
| 1596 | 1596 |
| 1597 const Directory::Kernel* Directory::kernel() const { | 1597 const Directory::Kernel* Directory::kernel() const { |
| 1598 return kernel_; | 1598 return kernel_; |
| 1599 } | 1599 } |
| 1600 | 1600 |
| 1601 } // namespace syncable | 1601 } // namespace syncable |
| 1602 } // namespace syncer | 1602 } // namespace syncer |
| OLD | NEW |