| Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.h
|
| diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
|
| index daf7e14cf1959596289c66c01f24ca5aa3def3c8..ae21f98c6caa769e8473d229c3a6626650d57ca1 100644
|
| --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
|
| +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
|
| @@ -76,8 +76,6 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
|
| int32 Add(WebKit::WebIDBDatabase* idb_database,
|
| int32 ipc_thread_id,
|
| const GURL& origin_url);
|
| - int32 Add(WebKit::WebIDBIndex* idb_index);
|
| - int32 Add(WebKit::WebIDBObjectStore* idb_object_store);
|
| int32 Add(WebKit::WebIDBTransaction* idb_transaction,
|
| int32 ipc_thread_id,
|
| const GURL& origin_url);
|
| @@ -95,7 +93,6 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
|
| void OnIDBFactoryGetDatabaseNames(
|
| const IndexedDBHostMsg_FactoryGetDatabaseNames_Params& p);
|
| void OnIDBFactoryOpen(const IndexedDBHostMsg_FactoryOpen_Params& p);
|
| - void OnIDBFactoryOpenOld(const IndexedDBHostMsg_FactoryOpen_Params& p);
|
|
|
| void OnIDBFactoryDeleteDatabase(
|
| const IndexedDBHostMsg_FactoryDeleteDatabase_Params& p);
|
| @@ -126,15 +123,8 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
|
|
|
| void OnMetadata(int32 ipc_database_id,
|
| IndexedDBDatabaseMetadata* metadata);
|
| - void OnCreateObjectStoreOld(
|
| - const IndexedDBHostMsg_DatabaseCreateObjectStoreOld_Params& params,
|
| - int32* object_store_id, WebKit::WebExceptionCode* ec);
|
| void OnCreateObjectStore(
|
| const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params);
|
| - void OnDeleteObjectStoreOld(int32 ipc_database_id,
|
| - int64 object_store_id,
|
| - int32 ipc_transaction_id,
|
| - WebKit::WebExceptionCode* ec);
|
| void OnDeleteObjectStore(int32 ipc_database_id,
|
| int64 transaction_id,
|
| int64 object_store_id);
|
| @@ -181,86 +171,6 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
|
| WebIDBTransactionIDToSizeMap transaction_size_map_;
|
| };
|
|
|
| - class IndexDispatcherHost {
|
| - public:
|
| - explicit IndexDispatcherHost(IndexedDBDispatcherHost* parent);
|
| - ~IndexDispatcherHost();
|
| -
|
| - bool OnMessageReceived(const IPC::Message& message, bool *msg_is_ok);
|
| - void Send(IPC::Message* message);
|
| -
|
| - void OnOpenObjectCursor(
|
| - const IndexedDBHostMsg_IndexOpenCursor_Params& params);
|
| - void OnOpenKeyCursor(const IndexedDBHostMsg_IndexOpenCursor_Params& params);
|
| - void OnCount(const IndexedDBHostMsg_IndexCount_Params& params);
|
| - void OnGetObject(int ipc_index_id,
|
| - int32 ipc_thread_id,
|
| - int32 ipc_response_id,
|
| - const IndexedDBKeyRange& key_range,
|
| - int32 ipc_transaction_id);
|
| - void OnGetKey(int ipc_index_id,
|
| - int32 ipc_thread_id,
|
| - int32 ipc_response_id,
|
| - const IndexedDBKeyRange& key_range,
|
| - int32 ipc_transaction_id);
|
| - void OnDestroyed(int32 ipc_index_id);
|
| -
|
| - IndexedDBDispatcherHost* parent_;
|
| - IDMap<WebKit::WebIDBIndex, IDMapOwnPointer> map_;
|
| - };
|
| -
|
| - class ObjectStoreDispatcherHost {
|
| - public:
|
| - explicit ObjectStoreDispatcherHost(IndexedDBDispatcherHost* parent);
|
| - ~ObjectStoreDispatcherHost();
|
| -
|
| - bool OnMessageReceived(const IPC::Message& message, bool *msg_is_ok);
|
| - void Send(IPC::Message* message);
|
| -
|
| - void OnGet(int ipc_object_store_id,
|
| - int32 ipc_thread_id,
|
| - int32 ipc_response_id,
|
| - const IndexedDBKeyRange& key_range,
|
| - int32 ipc_transaction_id);
|
| - void OnPut(const IndexedDBHostMsg_ObjectStorePut_Params& params);
|
| - void OnSetIndexKeys(
|
| - int32 ipc_object_store_id,
|
| - const IndexedDBKey& primary_key,
|
| - const std::vector<int64>& index_ids,
|
| - const std::vector<std::vector<IndexedDBKey> >& index_keys,
|
| - int32 ipc_transaction_id);
|
| - void OnSetIndexesReady(int32 ipc_object_store_id,
|
| - const std::vector<int64>& ids,
|
| - int32 ipc_transaction_id);
|
| - void OnDelete(int ipc_object_store_id,
|
| - int32 ipc_thread_id,
|
| - int32 ipc_response_id,
|
| - const IndexedDBKeyRange& key_range,
|
| - int32 ipc_transaction_id);
|
| - void OnClear(int ipc_object_store_id,
|
| - int32 ipc_thread_id,
|
| - int32 ipc_response_id,
|
| - int32 ipc_transaction_id);
|
| - void OnCreateIndex(
|
| - const IndexedDBHostMsg_ObjectStoreCreateIndex_Params& params,
|
| - int32* index_id,
|
| - WebKit::WebExceptionCode* ec);
|
| - void OnIndex(int32 ipc_object_store_id,
|
| - int64 index_id,
|
| - int32* ipc_index_id);
|
| - void OnDeleteIndex(int32 ipc_object_store_id,
|
| - int64 index_id,
|
| - int32 ipc_transaction_id,
|
| - WebKit::WebExceptionCode* ec);
|
| - void OnOpenCursor(
|
| - const IndexedDBHostMsg_ObjectStoreOpenCursor_Params& params);
|
| - void OnCount(const IndexedDBHostMsg_ObjectStoreCount_Params& params);
|
| - void OnDestroyed(int32 ipc_object_store_id);
|
| -
|
| - IndexedDBDispatcherHost* parent_;
|
| - IDMap<WebKit::WebIDBObjectStore, IDMapOwnPointer> map_;
|
| - };
|
| -
|
| class CursorDispatcherHost {
|
| public:
|
| explicit CursorDispatcherHost(IndexedDBDispatcherHost* parent);
|
| @@ -306,10 +216,6 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
|
|
|
| void OnCommit(int32 ipc_transaction_id);
|
| void OnAbort(int32 ipc_transaction_id);
|
| - void OnObjectStore(int32 ipc_transaction_id,
|
| - int64 object_store_id,
|
| - int32* ipc_object_store_id,
|
| - WebKit::WebExceptionCode* ec);
|
| void OnDidCompleteTaskEvents(int ipc_transaction_id);
|
| void OnDestroyed(int32 ipc_transaction_id);
|
|
|
| @@ -324,8 +230,6 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
|
|
|
| // Only access on WebKit thread.
|
| scoped_ptr<DatabaseDispatcherHost> database_dispatcher_host_;
|
| - scoped_ptr<IndexDispatcherHost> index_dispatcher_host_;
|
| - scoped_ptr<ObjectStoreDispatcherHost> object_store_dispatcher_host_;
|
| scoped_ptr<CursorDispatcherHost> cursor_dispatcher_host_;
|
| scoped_ptr<TransactionDispatcherHost> transaction_dispatcher_host_;
|
|
|
|
|