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

Unified Diff: chrome/browser/sync/engine/syncapi.h

Issue 2805095: Fix deadlock by introducing a new transaction event. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncapi.cc » ('j') | chrome/browser/sync/engine/syncapi.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncapi.h
diff --git a/chrome/browser/sync/engine/syncapi.h b/chrome/browser/sync/engine/syncapi.h
index bb9097639ace0b99fd867f4ede8d76ff2d774807..90e1a5c87556c5dd25feac30a57b24302bf2edb5 100644
--- a/chrome/browser/sync/engine/syncapi.h
+++ b/chrome/browser/sync/engine/syncapi.h
@@ -474,6 +474,10 @@ class ReadTransaction : public BaseTransaction {
public:
// Start a new read-only transaction on the specified repository.
explicit ReadTransaction(UserShare* share);
+
+ // Resume the middle of a transaction. Will not close transaction.
+ ReadTransaction(UserShare* share, syncable::BaseTransaction* trans);
+
virtual ~ReadTransaction();
// BaseTransaction override.
@@ -482,7 +486,8 @@ class ReadTransaction : public BaseTransaction {
void* operator new(size_t size); // Transaction is meant for stack use only.
// The underlying syncable object which this class wraps.
- syncable::ReadTransaction* transaction_;
+ syncable::BaseTransaction* transaction_;
+ bool close_transaction_;
DISALLOW_COPY_AND_ASSIGN(ReadTransaction);
};
« no previous file with comments | « no previous file | chrome/browser/sync/engine/syncapi.cc » ('j') | chrome/browser/sync/engine/syncapi.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698