| Index: content/child/indexed_db/indexed_db_dispatcher.cc
|
| diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
|
| index c924ffab8b73474ccda36f085b630dce700e44b0..e7dfd9609c69354a8162f710f9581aaf1265bbe0 100644
|
| --- a/content/child/indexed_db/indexed_db_dispatcher.cc
|
| +++ b/content/child/indexed_db/indexed_db_dispatcher.cc
|
| @@ -279,7 +279,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseCreateTransaction(
|
| int32 ipc_database_id,
|
| int64 transaction_id,
|
| WebIDBDatabaseCallbacks* database_callbacks_ptr,
|
| - WebKit::WebVector<long long> object_store_ids,
|
| + WebVector<long long> object_store_ids,
|
| unsigned short mode) {
|
| scoped_ptr<WebIDBDatabaseCallbacks> database_callbacks(
|
| database_callbacks_ptr);
|
| @@ -326,7 +326,7 @@ void IndexedDBDispatcher::RequestIDBDatabasePut(
|
| WebIDBDatabase::PutMode put_mode,
|
| WebIDBCallbacks* callbacks,
|
| const WebVector<long long>& index_ids,
|
| - const WebVector<WebKit::WebVector<WebIDBKey> >& index_keys) {
|
| + const WebVector<WebVector<WebIDBKey> >& index_keys) {
|
|
|
| if (value.size() > kMaxIDBValueSizeInBytes) {
|
| callbacks->onError(WebIDBDatabaseError(
|
| @@ -373,7 +373,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseOpenCursor(
|
| const IndexedDBKeyRange& key_range,
|
| unsigned short direction,
|
| bool key_only,
|
| - WebKit::WebIDBDatabase::TaskType task_type,
|
| + WebIDBDatabase::TaskType task_type,
|
| WebIDBCallbacks* callbacks) {
|
| ResetCursorPrefetchCaches();
|
| IndexedDBHostMsg_DatabaseOpenCursor_Params params;
|
| @@ -382,7 +382,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseOpenCursor(
|
| params.transaction_id = transaction_id;
|
| params.object_store_id = object_store_id;
|
| params.index_id = index_id;
|
| - params.key_range = IndexedDBKeyRange(key_range);
|
| + params.key_range = key_range;
|
| params.direction = direction;
|
| params.key_only = key_only;
|
| params.task_type = task_type;
|
| @@ -395,7 +395,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseCount(
|
| int64 object_store_id,
|
| int64 index_id,
|
| const IndexedDBKeyRange& key_range,
|
| - WebKit::WebIDBCallbacks* callbacks) {
|
| + WebIDBCallbacks* callbacks) {
|
| ResetCursorPrefetchCaches();
|
| IndexedDBHostMsg_DatabaseCount_Params params;
|
| init_params(params, callbacks);
|
| @@ -403,7 +403,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseCount(
|
| params.transaction_id = transaction_id;
|
| params.object_store_id = object_store_id;
|
| params.index_id = index_id;
|
| - params.key_range = IndexedDBKeyRange(key_range);
|
| + params.key_range = key_range;
|
| Send(new IndexedDBHostMsg_DatabaseCount(params));
|
| }
|
|
|
| @@ -412,7 +412,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseDeleteRange(
|
| int64 transaction_id,
|
| int64 object_store_id,
|
| const IndexedDBKeyRange& key_range,
|
| - WebKit::WebIDBCallbacks* callbacks) {
|
| + WebIDBCallbacks* callbacks) {
|
| ResetCursorPrefetchCaches();
|
| IndexedDBHostMsg_DatabaseDeleteRange_Params params;
|
| init_params(params, callbacks);
|
| @@ -427,7 +427,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseClear(
|
| int32 ipc_database_id,
|
| int64 transaction_id,
|
| int64 object_store_id,
|
| - WebKit::WebIDBCallbacks* callbacks_ptr) {
|
| + WebIDBCallbacks* callbacks_ptr) {
|
| scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| int32 ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
|
| Send(new IndexedDBHostMsg_DatabaseClear(CurrentWorkerId(),
|
|
|