Index: content/browser/indexed_db/indexed_db_backing_store.cc |
diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc |
index 1e1d85b4cbbf9e277f005c83fe55a180ce7f00b9..136d78f5562c0a261ebac44172258fa85970c828 100644 |
--- a/content/browser/indexed_db/indexed_db_backing_store.cc |
+++ b/content/browser/indexed_db/indexed_db_backing_store.cc |
@@ -1957,20 +1957,15 @@ leveldb::Status IndexedDBBackingStore::DeleteRange( |
database_id, |
object_store_id, |
key_range, |
- indexed_db::CURSOR_NEXT, |
+ blink::Next, |
&s); |
if (!s.ok()) |
return s; |
if (!start_cursor) |
return leveldb::Status::OK(); // Empty range == delete success. |
- scoped_ptr<IndexedDBBackingStore::Cursor> end_cursor = |
- OpenObjectStoreCursor(transaction, |
- database_id, |
- object_store_id, |
- key_range, |
- indexed_db::CURSOR_PREV, |
- &s); |
+ scoped_ptr<IndexedDBBackingStore::Cursor> end_cursor = OpenObjectStoreCursor( |
+ transaction, database_id, object_store_id, key_range, blink::Prev, &s); |
if (!s.ok()) |
return s; |
@@ -3559,7 +3554,7 @@ bool ObjectStoreCursorOptions( |
int64 database_id, |
int64 object_store_id, |
const IndexedDBKeyRange& range, |
- indexed_db::CursorDirection direction, |
+ blink::Direction direction, |
IndexedDBBackingStore::Cursor::CursorOptions* cursor_options) { |
cursor_options->database_id = database_id; |
cursor_options->object_store_id = object_store_id; |
@@ -3567,10 +3562,9 @@ bool ObjectStoreCursorOptions( |
bool lower_bound = range.lower().IsValid(); |
bool upper_bound = range.upper().IsValid(); |
cursor_options->forward = |
- (direction == indexed_db::CURSOR_NEXT_NO_DUPLICATE || |
- direction == indexed_db::CURSOR_NEXT); |
- cursor_options->unique = (direction == indexed_db::CURSOR_NEXT_NO_DUPLICATE || |
- direction == indexed_db::CURSOR_PREV_NO_DUPLICATE); |
+ (direction == blink::NextNoDuplicate || direction == blink::Next); |
+ cursor_options->unique = (direction == blink::NextNoDuplicate || |
+ direction == blink::PrevNoDuplicate); |
if (!lower_bound) { |
cursor_options->low_key = |
@@ -3632,7 +3626,7 @@ bool IndexCursorOptions( |
int64 object_store_id, |
int64 index_id, |
const IndexedDBKeyRange& range, |
- indexed_db::CursorDirection direction, |
+ blink::Direction direction, |
IndexedDBBackingStore::Cursor::CursorOptions* cursor_options) { |
DCHECK(transaction); |
if (!KeyPrefix::ValidIds(database_id, object_store_id, index_id)) |
@@ -3645,10 +3639,9 @@ bool IndexCursorOptions( |
bool lower_bound = range.lower().IsValid(); |
bool upper_bound = range.upper().IsValid(); |
cursor_options->forward = |
- (direction == indexed_db::CURSOR_NEXT_NO_DUPLICATE || |
- direction == indexed_db::CURSOR_NEXT); |
- cursor_options->unique = (direction == indexed_db::CURSOR_NEXT_NO_DUPLICATE || |
- direction == indexed_db::CURSOR_PREV_NO_DUPLICATE); |
+ (direction == blink::NextNoDuplicate || direction == blink::Next); |
+ cursor_options->unique = (direction == blink::NextNoDuplicate || |
+ direction == blink::PrevNoDuplicate); |
if (!lower_bound) { |
cursor_options->low_key = |
@@ -3705,7 +3698,7 @@ IndexedDBBackingStore::OpenObjectStoreCursor( |
int64 database_id, |
int64 object_store_id, |
const IndexedDBKeyRange& range, |
- indexed_db::CursorDirection direction, |
+ blink::Direction direction, |
leveldb::Status* s) { |
IDB_TRACE("IndexedDBBackingStore::OpenObjectStoreCursor"); |
*s = leveldb::Status::OK(); |
@@ -3732,7 +3725,7 @@ IndexedDBBackingStore::OpenObjectStoreKeyCursor( |
int64 database_id, |
int64 object_store_id, |
const IndexedDBKeyRange& range, |
- indexed_db::CursorDirection direction, |
+ blink::Direction direction, |
leveldb::Status* s) { |
IDB_TRACE("IndexedDBBackingStore::OpenObjectStoreKeyCursor"); |
*s = leveldb::Status::OK(); |
@@ -3760,7 +3753,7 @@ IndexedDBBackingStore::OpenIndexKeyCursor( |
int64 object_store_id, |
int64 index_id, |
const IndexedDBKeyRange& range, |
- indexed_db::CursorDirection direction, |
+ blink::Direction direction, |
leveldb::Status* s) { |
IDB_TRACE("IndexedDBBackingStore::OpenIndexKeyCursor"); |
*s = leveldb::Status::OK(); |
@@ -3789,7 +3782,7 @@ IndexedDBBackingStore::OpenIndexCursor( |
int64 object_store_id, |
int64 index_id, |
const IndexedDBKeyRange& range, |
- indexed_db::CursorDirection direction, |
+ blink::Direction direction, |
leveldb::Status* s) { |
IDB_TRACE("IndexedDBBackingStore::OpenIndexCursor"); |
LevelDBTransaction* leveldb_transaction = transaction->transaction(); |