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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/syncable/model_neutral_mutable_entry.cc

Issue 1057663002: [Sync] Eliminate friends from Directory by exposing kernel via accessor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unnecessary type qualifier on kernel()'s return type. Created 5 years, 9 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
« sync/syncable/directory.h ('K') | « sync/syncable/directory_unittest.cc ('k') | sync/syncable/mutable_entry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/syncable/model_neutral_mutable_entry.cc
diff --git a/sync/syncable/model_neutral_mutable_entry.cc b/sync/syncable/model_neutral_mutable_entry.cc
index 81c25c3de495981b0b12445725027607a41a3662..b06c7073a0ba60ae0c31da437cd9afc602aaea91 100644
--- a/sync/syncable/model_neutral_mutable_entry.cc
+++ b/sync/syncable/model_neutral_mutable_entry.cc
@@ -32,7 +32,7 @@ ModelNeutralMutableEntry::ModelNeutralMutableEntry(BaseWriteTransaction* trans,
kernel->put(ID, id);
kernel->put(META_HANDLE, trans->directory()->NextMetahandle());
- kernel->mark_dirty(&trans->directory()->kernel_->dirty_metahandles);
+ kernel->mark_dirty(&trans->directory()->kernel()->dirty_metahandles);
kernel->put(IS_DEL, true);
// We match the database defaults here
kernel->put(BASE_VERSION, CHANGES_VERSION);
@@ -69,7 +69,7 @@ ModelNeutralMutableEntry::ModelNeutralMutableEntry(BaseWriteTransaction* trans,
kernel->put(NON_UNIQUE_NAME, ModelTypeToString(type));
kernel->put(IS_DIR, true);
- kernel->mark_dirty(&trans->directory()->kernel_->dirty_metahandles);
+ kernel->mark_dirty(&trans->directory()->kernel()->dirty_metahandles);
if (!trans->directory()->InsertEntry(trans, kernel.get())) {
return; // Failed inserting.
@@ -105,7 +105,7 @@ void ModelNeutralMutableEntry::PutBaseVersion(int64 value) {
base_write_transaction_->TrackChangesTo(kernel_);
if (kernel_->ref(BASE_VERSION) != value) {
kernel_->put(BASE_VERSION, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -115,7 +115,7 @@ void ModelNeutralMutableEntry::PutServerVersion(int64 value) {
if (kernel_->ref(SERVER_VERSION) != value) {
ScopedKernelLock lock(dir());
kernel_->put(SERVER_VERSION, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -124,7 +124,7 @@ void ModelNeutralMutableEntry::PutServerMtime(base::Time value) {
base_write_transaction_->TrackChangesTo(kernel_);
if (kernel_->ref(SERVER_MTIME) != value) {
kernel_->put(SERVER_MTIME, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -133,7 +133,7 @@ void ModelNeutralMutableEntry::PutServerCtime(base::Time value) {
base_write_transaction_->TrackChangesTo(kernel_);
if (kernel_->ref(SERVER_CTIME) != value) {
kernel_->put(SERVER_CTIME, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -143,7 +143,7 @@ bool ModelNeutralMutableEntry::PutId(const Id& value) {
if (kernel_->ref(ID) != value) {
if (!dir()->ReindexId(base_write_transaction(), kernel_, value))
return false;
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
return true;
}
@@ -154,7 +154,7 @@ void ModelNeutralMutableEntry::PutServerParentId(const Id& value) {
if (kernel_->ref(SERVER_PARENT_ID) != value) {
kernel_->put(SERVER_PARENT_ID, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -162,7 +162,7 @@ bool ModelNeutralMutableEntry::PutIsUnsynced(bool value) {
DCHECK(kernel_);
base_write_transaction_->TrackChangesTo(kernel_);
if (kernel_->ref(IS_UNSYNCED) != value) {
- MetahandleSet* index = &dir()->kernel_->unsynced_metahandles;
+ MetahandleSet* index = &dir()->kernel()->unsynced_metahandles;
ScopedKernelLock lock(dir());
if (value) {
@@ -181,7 +181,7 @@ bool ModelNeutralMutableEntry::PutIsUnsynced(bool value) {
}
}
kernel_->put(IS_UNSYNCED, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
return true;
}
@@ -193,7 +193,7 @@ bool ModelNeutralMutableEntry::PutIsUnappliedUpdate(bool value) {
// Use kernel_->GetServerModelType() instead of
// GetServerModelType() as we may trigger some DCHECKs in the
// latter.
- MetahandleSet* index = &dir()->kernel_->unapplied_update_metahandles[
+ MetahandleSet* index = &dir()->kernel()->unapplied_update_metahandles[
kernel_->GetServerModelType()];
ScopedKernelLock lock(dir());
@@ -213,7 +213,7 @@ bool ModelNeutralMutableEntry::PutIsUnappliedUpdate(bool value) {
}
}
kernel_->put(IS_UNAPPLIED_UPDATE, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
return true;
}
@@ -253,7 +253,7 @@ void ModelNeutralMutableEntry::PutServerNonUniqueName(
if (kernel_->ref(SERVER_NON_UNIQUE_NAME) != value) {
kernel_->put(SERVER_NON_UNIQUE_NAME, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -265,17 +265,17 @@ bool ModelNeutralMutableEntry::PutUniqueServerTag(const string& new_tag) {
base_write_transaction_->TrackChangesTo(kernel_);
ScopedKernelLock lock(dir());
// Make sure your new value is not in there already.
- if (dir()->kernel_->server_tags_map.find(new_tag) !=
- dir()->kernel_->server_tags_map.end()) {
+ if (dir()->kernel()->server_tags_map.find(new_tag) !=
+ dir()->kernel()->server_tags_map.end()) {
DVLOG(1) << "Detected duplicate server tag";
return false;
}
- dir()->kernel_->server_tags_map.erase(
+ dir()->kernel()->server_tags_map.erase(
kernel_->ref(UNIQUE_SERVER_TAG));
kernel_->put(UNIQUE_SERVER_TAG, new_tag);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
if (!new_tag.empty()) {
- dir()->kernel_->server_tags_map[new_tag] = kernel_;
+ dir()->kernel()->server_tags_map[new_tag] = kernel_;
}
return true;
@@ -289,17 +289,17 @@ bool ModelNeutralMutableEntry::PutUniqueClientTag(const string& new_tag) {
base_write_transaction_->TrackChangesTo(kernel_);
ScopedKernelLock lock(dir());
// Make sure your new value is not in there already.
- if (dir()->kernel_->client_tags_map.find(new_tag) !=
- dir()->kernel_->client_tags_map.end()) {
+ if (dir()->kernel()->client_tags_map.find(new_tag) !=
+ dir()->kernel()->client_tags_map.end()) {
DVLOG(1) << "Detected duplicate client tag";
return false;
}
- dir()->kernel_->client_tags_map.erase(
+ dir()->kernel()->client_tags_map.erase(
kernel_->ref(UNIQUE_CLIENT_TAG));
kernel_->put(UNIQUE_CLIENT_TAG, new_tag);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
if (!new_tag.empty()) {
- dir()->kernel_->client_tags_map[new_tag] = kernel_;
+ dir()->kernel()->client_tags_map[new_tag] = kernel_;
}
return true;
@@ -325,7 +325,7 @@ void ModelNeutralMutableEntry::PutUniqueBookmarkTag(const std::string& tag) {
}
kernel_->put(UNIQUE_BOOKMARK_TAG, tag);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
void ModelNeutralMutableEntry::PutServerSpecifics(
@@ -343,20 +343,20 @@ void ModelNeutralMutableEntry::PutServerSpecifics(
const ModelType old_server_type = kernel_->GetServerModelType();
const int64 metahandle = kernel_->ref(META_HANDLE);
size_t erase_count =
- dir()->kernel_->unapplied_update_metahandles[old_server_type]
+ dir()->kernel()->unapplied_update_metahandles[old_server_type]
.erase(metahandle);
DCHECK_EQ(erase_count, 1u);
}
kernel_->put(SERVER_SPECIFICS, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
if (kernel_->ref(IS_UNAPPLIED_UPDATE)) {
// Add ourselves back into unapplied_update_metahandles with our
// new server type.
const ModelType new_server_type = kernel_->GetServerModelType();
const int64 metahandle = kernel_->ref(META_HANDLE);
- dir()->kernel_->unapplied_update_metahandles[new_server_type]
+ dir()->kernel()->unapplied_update_metahandles[new_server_type]
.insert(metahandle);
}
}
@@ -372,7 +372,7 @@ void ModelNeutralMutableEntry::PutBaseServerSpecifics(
if (kernel_->ref(BASE_SERVER_SPECIFICS).SerializeAsString()
!= value.SerializeAsString()) {
kernel_->put(BASE_SERVER_SPECIFICS, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -385,7 +385,7 @@ void ModelNeutralMutableEntry::PutServerUniquePosition(
DCHECK(value.IsValid());
ScopedKernelLock lock(dir());
kernel_->put(SERVER_UNIQUE_POSITION, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -397,7 +397,7 @@ void ModelNeutralMutableEntry::PutServerAttachmentMetadata(
if (kernel_->ref(SERVER_ATTACHMENT_METADATA).SerializeAsString() !=
value.SerializeAsString()) {
kernel_->put(SERVER_ATTACHMENT_METADATA, value);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
}
@@ -408,20 +408,20 @@ void ModelNeutralMutableEntry::PutSyncing(bool value) {
void ModelNeutralMutableEntry::PutParentIdPropertyOnly(const Id& parent_id) {
base_write_transaction_->TrackChangesTo(kernel_);
dir()->ReindexParentId(base_write_transaction(), kernel_, parent_id);
- kernel_->mark_dirty(&dir()->kernel_->dirty_metahandles);
+ kernel_->mark_dirty(&dir()->kernel()->dirty_metahandles);
}
void ModelNeutralMutableEntry::UpdateTransactionVersion(int64 value) {
ScopedKernelLock lock(dir());
kernel_->put(TRANSACTION_VERSION, value);
- kernel_->mark_dirty(&(dir()->kernel_->dirty_metahandles));
+ kernel_->mark_dirty(&(dir()->kernel()->dirty_metahandles));
}
ModelNeutralMutableEntry::ModelNeutralMutableEntry(BaseWriteTransaction* trans)
: Entry(trans), base_write_transaction_(trans) {}
MetahandleSet* ModelNeutralMutableEntry::GetDirtyIndexHelper() {
- return &dir()->kernel_->dirty_metahandles;
+ return &dir()->kernel()->dirty_metahandles;
}
} // namespace syncable
« sync/syncable/directory.h ('K') | « sync/syncable/directory_unittest.cc ('k') | sync/syncable/mutable_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698