WIP: The Bookmark Position Megapatch

sync/syncable/entry.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SYNC_SYNCABLE_ENTRY_H_
 #define SYNC_SYNCABLE_ENTRY_H_
 
 #include "sync/syncable/entry_kernel.h"
 
 namespace syncer {
@@ skipping 74 matching lines @@
   }
   inline bool Get(BitField field) const {
     DCHECK(kernel_);
     return kernel_->ref(field);
   }
   const std::string& Get(StringField field) const;
   inline const sync_pb::EntitySpecifics& Get(ProtoField field) const {
     DCHECK(kernel_);
     return kernel_->ref(field);
   }
-  inline const NodeOrdinal& Get(OrdinalField field) const {
+  inline const UniquePosition& Get(UniquePositionField field) const {
     DCHECK(kernel_);
     return kernel_->ref(field);
   }
+  const std::string& Get(BytesField field) const;
   inline bool Get(BitTemp field) const {
     DCHECK(kernel_);
     return kernel_->ref(field);
   }
 
   ModelType GetServerModelType() const;
   ModelType GetModelType() const;
 
+  Id GetPredecessorId() const;
+  Id GetSuccessorId() const;
+  Id GetFirstChildId() const;
+
   inline bool ExistsOnClientBecauseNameIsNonEmpty() const {
     DCHECK(kernel_);
     return !kernel_->ref(NON_UNIQUE_NAME).empty();
   }
 
   inline bool IsRoot() const {
     DCHECK(kernel_);
     return kernel_->ref(ID).IsRoot();
   }
 
   Directory* dir() const;
 
   const EntryKernel GetKernelCopy() const {
     return *kernel_;
   }
 
-  // Compute a local predecessor position for |update_item|, based on its
-  // absolute server position.  The returned ID will be a valid predecessor
-  // under SERVER_PARENT_ID that is consistent with the
-  // SERVER_POSITION_IN_PARENT ordering.
-  Id ComputePrevIdFromServerPosition(const Id& parent_id) const;
-
   // Dumps all entry info into a DictionaryValue and returns it.
   // Transfers ownership of the DictionaryValue to the caller.
   base::DictionaryValue* ToValue(Cryptographer* cryptographer) const;
 
  protected:  // Don't allow creation on heap, except by sync API wrappers.
   void* operator new(size_t size) { return (::operator new)(size); }
 
   inline explicit Entry(BaseTransaction* trans)
       : basetrans_(trans),
         kernel_(NULL) { }
@@ skipping 10 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Entry);
 };
 
 std::ostream& operator<<(std::ostream& os, const Entry& entry);
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_ENTRY_H_