| Index: content/child/indexed_db/indexed_db_dispatcher.h
|
| diff --git a/content/child/indexed_db/indexed_db_dispatcher.h b/content/child/indexed_db/indexed_db_dispatcher.h
|
| index d0e1118dc818c9379ae7d3b65bc30d40c7fa70c0..3c6a935a638cd4e30d4394112eb3a9ff9dae5317 100644
|
| --- a/content/child/indexed_db/indexed_db_dispatcher.h
|
| +++ b/content/child/indexed_db/indexed_db_dispatcher.h
|
| @@ -18,9 +18,8 @@
|
| #include "ipc/ipc_sync_message_filter.h"
|
| #include "third_party/WebKit/public/platform/WebBlobInfo.h"
|
| #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
|
| -#include "third_party/WebKit/public/platform/WebIDBCursor.h"
|
| -#include "third_party/WebKit/public/platform/WebIDBDatabase.h"
|
| #include "third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h"
|
| +#include "third_party/WebKit/public/platform/WebIDBTypes.h"
|
|
|
| struct IndexedDBDatabaseMetadata;
|
| struct IndexedDBMsg_CallbacksSuccessCursorContinue_Params;
|
| @@ -118,7 +117,7 @@ class CONTENT_EXPORT IndexedDBDispatcher : public WorkerTaskRunner::Observer {
|
| int64 transaction_id,
|
| blink::WebIDBDatabaseCallbacks* database_callbacks_ptr,
|
| blink::WebVector<long long> object_store_ids,
|
| - blink::WebIDBDatabase::TransactionMode mode);
|
| + blink::WebIDBTransactionMode mode);
|
|
|
| void RequestIDBDatabaseGet(int32 ipc_database_id,
|
| int64 transaction_id,
|
| @@ -135,7 +134,7 @@ class CONTENT_EXPORT IndexedDBDispatcher : public WorkerTaskRunner::Observer {
|
| const blink::WebData& value,
|
| const blink::WebVector<blink::WebBlobInfo>& web_blob_info,
|
| const IndexedDBKey& key,
|
| - blink::WebIDBDatabase::PutMode put_mode,
|
| + blink::WebIDBPutMode put_mode,
|
| blink::WebIDBCallbacks* callbacks,
|
| const blink::WebVector<long long>& index_ids,
|
| const blink::WebVector<blink::WebVector<blink::WebIDBKey> >& index_keys);
|
| @@ -145,9 +144,9 @@ class CONTENT_EXPORT IndexedDBDispatcher : public WorkerTaskRunner::Observer {
|
| int64 object_store_id,
|
| int64 index_id,
|
| const IndexedDBKeyRange& key_range,
|
| - blink::WebIDBCursor::Direction direction,
|
| + blink::WebIDBCursorDirection direction,
|
| bool key_only,
|
| - blink::WebIDBDatabase::TaskType task_type,
|
| + blink::WebIDBTaskType task_type,
|
| blink::WebIDBCallbacks* callbacks);
|
|
|
| void RequestIDBDatabaseCount(int32 ipc_database_id,
|
|
|