| Index: content/browser/indexed_db/indexed_db_transaction.h
|
| diff --git a/content/browser/indexed_db/indexed_db_transaction.h b/content/browser/indexed_db/indexed_db_transaction.h
|
| index e30422f15ab35b88075d42667514c06c920d062c..93f93e13bc6c1820ee3c22ab4fc8a9efbb910572 100644
|
| --- a/content/browser/indexed_db/indexed_db_transaction.h
|
| +++ b/content/browser/indexed_db/indexed_db_transaction.h
|
| @@ -17,6 +17,7 @@
|
| #include "content/browser/indexed_db/indexed_db_backing_store.h"
|
| #include "content/browser/indexed_db/indexed_db_database.h"
|
| #include "content/browser/indexed_db/indexed_db_database_error.h"
|
| +#include "third_party/WebKit/public/platform/WebIDBTypes.h"
|
|
|
| namespace content {
|
|
|
| @@ -33,7 +34,7 @@ class CONTENT_EXPORT IndexedDBTransaction
|
| int64 id,
|
| scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
|
| const std::set<int64>& object_store_ids,
|
| - indexed_db::TransactionMode,
|
| + blink::WebIDBTransactionMode,
|
| IndexedDBDatabase* db,
|
| IndexedDBBackingStore::Transaction* backing_store_transaction);
|
|
|
| @@ -44,13 +45,13 @@ class CONTENT_EXPORT IndexedDBTransaction
|
| // Called by the transaction coordinator when this transaction is unblocked.
|
| void Start();
|
|
|
| - indexed_db::TransactionMode mode() const { return mode_; }
|
| + blink::WebIDBTransactionMode mode() const { return mode_; }
|
| const std::set<int64>& scope() const { return object_store_ids_; }
|
|
|
| void ScheduleTask(Operation task) {
|
| - ScheduleTask(IndexedDBDatabase::NORMAL_TASK, task);
|
| + ScheduleTask(blink::WebIDBTaskTypeNormal, task);
|
| }
|
| - void ScheduleTask(IndexedDBDatabase::TaskType, Operation task);
|
| + void ScheduleTask(blink::WebIDBTaskType, Operation task);
|
| void ScheduleAbortTask(Operation abort_task);
|
| void RegisterOpenCursor(IndexedDBCursor* cursor);
|
| void UnregisterOpenCursor(IndexedDBCursor* cursor);
|
| @@ -113,7 +114,7 @@ class CONTENT_EXPORT IndexedDBTransaction
|
|
|
| const int64 id_;
|
| const std::set<int64> object_store_ids_;
|
| - const indexed_db::TransactionMode mode_;
|
| + const blink::WebIDBTransactionMode mode_;
|
|
|
| bool used_;
|
| State state_;
|
|
|