| Index: content/common/indexed_db/indexed_db_dispatcher.cc
|
| diff --git a/content/common/indexed_db/indexed_db_dispatcher.cc b/content/common/indexed_db/indexed_db_dispatcher.cc
|
| index efda0cf452e9696db70cfee13e7179c12f402348..d3416f3f73ed0c793420d9a2693f25614cf1fb77 100644
|
| --- a/content/common/indexed_db/indexed_db_dispatcher.cc
|
| +++ b/content/common/indexed_db/indexed_db_dispatcher.cc
|
| @@ -10,8 +10,6 @@
|
| #include "content/common/indexed_db/indexed_db_messages.h"
|
| #include "content/common/indexed_db/proxy_webidbcursor_impl.h"
|
| #include "content/common/indexed_db/proxy_webidbdatabase_impl.h"
|
| -#include "content/common/indexed_db/proxy_webidbindex_impl.h"
|
| -#include "content/common/indexed_db/proxy_webidbobjectstore_impl.h"
|
| #include "content/common/indexed_db/proxy_webidbtransaction_impl.h"
|
| #include "ipc/ipc_channel.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
|
| @@ -435,207 +433,6 @@ void IndexedDBDispatcher::RequestIDBDatabaseClear(
|
| transaction_id, object_store_id));
|
| }
|
|
|
| -void IndexedDBDispatcher::RequestIDBIndexOpenObjectCursor(
|
| - const WebIDBKeyRange& idb_key_range,
|
| - unsigned short direction,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_index_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - IndexedDBHostMsg_IndexOpenCursor_Params params;
|
| - params.ipc_thread_id = CurrentWorkerId();
|
| - params.ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - params.key_range = IndexedDBKeyRange(idb_key_range);
|
| - params.direction = direction;
|
| - params.ipc_index_id = ipc_index_id;
|
| - params.ipc_transaction_id = TransactionId(transaction);
|
| - Send(new IndexedDBHostMsg_IndexOpenObjectCursor(params));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBIndexOpenKeyCursor(
|
| - const WebIDBKeyRange& idb_key_range,
|
| - unsigned short direction,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_index_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - IndexedDBHostMsg_IndexOpenCursor_Params params;
|
| - params.ipc_thread_id = CurrentWorkerId();
|
| - params.ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - params.key_range = IndexedDBKeyRange(idb_key_range);
|
| - params.direction = direction;
|
| - params.ipc_index_id = ipc_index_id;
|
| - params.ipc_transaction_id = TransactionId(transaction);
|
| - Send(new IndexedDBHostMsg_IndexOpenKeyCursor(params));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBIndexCount(
|
| - const WebIDBKeyRange& idb_key_range,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_index_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - IndexedDBHostMsg_IndexCount_Params params;
|
| - params.ipc_thread_id = CurrentWorkerId();
|
| - params.ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - params.key_range = IndexedDBKeyRange(idb_key_range);
|
| - params.ipc_index_id = ipc_index_id;
|
| - params.ipc_transaction_id = TransactionId(transaction);
|
| - Send(new IndexedDBHostMsg_IndexCount(params));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBIndexGetObject(
|
| - const IndexedDBKeyRange& key_range,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_index_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - int32 ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - Send(new IndexedDBHostMsg_IndexGetObject(
|
| - ipc_index_id, CurrentWorkerId(),
|
| - ipc_response_id, key_range,
|
| - TransactionId(transaction)));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBIndexGetKey(
|
| - const IndexedDBKeyRange& key_range,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_index_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - int32 ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - Send(new IndexedDBHostMsg_IndexGetKey(
|
| - ipc_index_id, CurrentWorkerId(), ipc_response_id, key_range,
|
| - TransactionId(transaction)));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBObjectStoreGet(
|
| - const IndexedDBKeyRange& key_range,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_object_store_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| -
|
| - int32 ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - Send(new IndexedDBHostMsg_ObjectStoreGet(
|
| - ipc_object_store_id, CurrentWorkerId(), ipc_response_id,
|
| - key_range, TransactionId(transaction)));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBObjectStorePut(
|
| - const SerializedScriptValue& value,
|
| - const IndexedDBKey& key,
|
| - WebKit::WebIDBObjectStore::PutMode put_mode,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_object_store_id,
|
| - const WebIDBTransaction& transaction,
|
| - const WebKit::WebVector<long long>& index_ids,
|
| - const WebKit::WebVector<WebKit::WebVector<
|
| - WebKit::WebIDBKey> >& index_keys) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - IndexedDBHostMsg_ObjectStorePut_Params params;
|
| - params.ipc_thread_id = CurrentWorkerId();
|
| - params.ipc_object_store_id = ipc_object_store_id;
|
| - params.ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - params.serialized_value = value;
|
| - params.key = key;
|
| - params.put_mode = put_mode;
|
| - params.ipc_transaction_id = TransactionId(transaction);
|
| - params.index_ids.resize(index_ids.size());
|
| - for (size_t i = 0; i < index_ids.size(); ++i) {
|
| - params.index_ids[i] = index_ids[i];
|
| - }
|
| -
|
| - params.index_keys.resize(index_keys.size());
|
| - for (size_t i = 0; i < index_keys.size(); ++i) {
|
| - params.index_keys[i].resize(index_keys[i].size());
|
| - for (size_t j = 0; j < index_keys[i].size(); ++j) {
|
| - params.index_keys[i][j] = IndexedDBKey(index_keys[i][j]);
|
| - }
|
| - }
|
| - Send(new IndexedDBHostMsg_ObjectStorePut(params));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBObjectStoreDelete(
|
| - const IndexedDBKeyRange& key_range,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_object_store_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| -
|
| - int32 ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - Send(new IndexedDBHostMsg_ObjectStoreDelete(
|
| - ipc_object_store_id, CurrentWorkerId(), ipc_response_id, key_range,
|
| - TransactionId(transaction)));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBObjectStoreClear(
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_object_store_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| -
|
| - int32 ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - Send(new IndexedDBHostMsg_ObjectStoreClear(
|
| - ipc_object_store_id, CurrentWorkerId(), ipc_response_id,
|
| - TransactionId(transaction)));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBObjectStoreOpenCursor(
|
| - const WebIDBKeyRange& idb_key_range,
|
| - WebKit::WebIDBCursor::Direction direction,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_object_store_id,
|
| - WebKit::WebIDBTransaction::TaskType task_type,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - IndexedDBHostMsg_ObjectStoreOpenCursor_Params params;
|
| - params.ipc_thread_id = CurrentWorkerId();
|
| - params.ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - params.key_range = IndexedDBKeyRange(idb_key_range);
|
| - params.direction = direction;
|
| - params.ipc_object_store_id = ipc_object_store_id;
|
| - params.task_type = task_type;
|
| - params.ipc_transaction_id = TransactionId(transaction);
|
| - Send(new IndexedDBHostMsg_ObjectStoreOpenCursor(params));
|
| -}
|
| -
|
| -void IndexedDBDispatcher::RequestIDBObjectStoreCount(
|
| - const WebIDBKeyRange& idb_key_range,
|
| - WebIDBCallbacks* callbacks_ptr,
|
| - int32 ipc_object_store_id,
|
| - const WebIDBTransaction& transaction,
|
| - WebExceptionCode* ec) {
|
| - ResetCursorPrefetchCaches();
|
| - scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
|
| - IndexedDBHostMsg_ObjectStoreCount_Params params;
|
| - params.ipc_thread_id = CurrentWorkerId();
|
| - params.ipc_response_id = pending_callbacks_.Add(callbacks.release());
|
| - params.key_range = IndexedDBKeyRange(idb_key_range);
|
| - params.ipc_object_store_id = ipc_object_store_id;
|
| - params.ipc_transaction_id = TransactionId(transaction);
|
| - Send(new IndexedDBHostMsg_ObjectStoreCount(params));
|
| -}
|
| -
|
| void IndexedDBDispatcher::RegisterWebIDBTransactionCallbacks(
|
| WebIDBTransactionCallbacks* callbacks,
|
| int32 id) {
|
|
|