diff options
author | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 23:30:53 +0000 |
---|---|---|
committer | jsbell@chromium.org <jsbell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 23:30:53 +0000 |
commit | 4a25b54d725f60367020d1ee3f302125fcbd8458 (patch) | |
tree | 16f6ca8fa153d05f3cd2db77bf926e21964b766e /content/browser/in_process_webkit | |
parent | ff3cf99a8e013e98707fc3420ffe4be5d04a91d7 (diff) | |
download | chromium_src-4a25b54d725f60367020d1ee3f302125fcbd8458.zip chromium_src-4a25b54d725f60367020d1ee3f302125fcbd8458.tar.gz chromium_src-4a25b54d725f60367020d1ee3f302125fcbd8458.tar.bz2 |
IndexedDB: Remove IPC plumbing for obsolete property accessors.
Now that webkit.org/b/88467 has landed the IDB front end can directly respond
to property requests (name, version, flags, etc) from script, so the IPC
plumbing to route these requests to the back end can be removed.
R=michaeln@chromium.org,dgrogan@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10657011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/in_process_webkit')
-rw-r--r-- | content/browser/in_process_webkit/indexed_db_dispatcher_host.cc | 97 | ||||
-rw-r--r-- | content/browser/in_process_webkit/indexed_db_dispatcher_host.h | 15 |
2 files changed, 0 insertions, 112 deletions
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc index 12d9d16..8c217e0 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc @@ -327,10 +327,6 @@ bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived( IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::DatabaseDispatcherHost, message, *msg_is_ok) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseMetadata, OnMetadata) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseName, OnName) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseVersion, OnVersion) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseObjectStoreNames, - OnObjectStoreNames) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseCreateObjectStore, OnCreateObjectStore) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseDeleteObjectStore, @@ -383,30 +379,6 @@ void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMetadata( } } -void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnName( - int32 object_id, string16* name) { - parent_->SyncGetter<string16>(&map_, object_id, name, &WebIDBDatabase::name); -} - -void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnVersion( - int32 object_id, string16* version) { - parent_->SyncGetter<string16>( - &map_, object_id, version, &WebIDBDatabase::version); -} - -void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnObjectStoreNames( - int32 idb_database_id, std::vector<string16>* object_stores) { - WebIDBDatabase* idb_database = parent_->GetOrTerminateProcess( - &map_, idb_database_id); - if (!idb_database) - return; - - WebDOMStringList web_object_stores = idb_database->objectStoreNames(); - object_stores->reserve(web_object_stores.length()); - for (unsigned i = 0; i < web_object_stores.length(); ++i) - object_stores->push_back(web_object_stores.item(i)); -} - void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateObjectStore( const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params, int32* object_store_id, WebKit::WebExceptionCode* ec) { @@ -538,10 +510,6 @@ bool IndexedDBDispatcherHost::IndexDispatcherHost::OnMessageReceived( bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::IndexDispatcherHost, message, *msg_is_ok) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexName, OnName) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexKeyPath, OnKeyPath) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexUnique, OnUnique) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexMultiEntry, OnMultiEntry) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexOpenObjectCursor, OnOpenObjectCursor) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexOpenKeyCursor, OnOpenKeyCursor) @@ -559,31 +527,6 @@ void IndexedDBDispatcherHost::IndexDispatcherHost::Send( parent_->Send(message); } -void IndexedDBDispatcherHost::IndexDispatcherHost::OnName( - int32 object_id, string16* name) { - parent_->SyncGetter<string16>(&map_, object_id, name, &WebIDBIndex::name); -} - -void IndexedDBDispatcherHost::IndexDispatcherHost::OnKeyPath( - int32 object_id, IndexedDBKeyPath* key_path) { - WebIDBIndex* idb_index = parent_->GetOrTerminateProcess(&map_, object_id); - if (!idb_index) - return; - - *key_path = IndexedDBKeyPath(idb_index->keyPath()); -} - -void IndexedDBDispatcherHost::IndexDispatcherHost::OnUnique( - int32 object_id, bool* unique) { - parent_->SyncGetter<bool>(&map_, object_id, unique, &WebIDBIndex::unique); -} - -void IndexedDBDispatcherHost::IndexDispatcherHost::OnMultiEntry( - int32 object_id, bool* multi_entry) { - parent_->SyncGetter<bool>( - &map_, object_id, multi_entry, &WebIDBIndex::multiEntry); -} - void IndexedDBDispatcherHost::IndexDispatcherHost::OnOpenObjectCursor( const IndexedDBHostMsg_IndexOpenCursor_Params& params, WebKit::WebExceptionCode* ec) { @@ -711,11 +654,6 @@ bool IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnMessageReceived( bool handled = true; IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost::ObjectStoreDispatcherHost, message, *msg_is_ok) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreName, OnName) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreKeyPath, OnKeyPath) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreIndexNames, OnIndexNames) - IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreAutoIncrement, - OnAutoIncrement) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreGet, OnGet) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStorePut, OnPut) IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreDelete, OnDelete) @@ -736,41 +674,6 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::Send( parent_->Send(message); } -void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnName( - int32 object_id, string16* name) { - parent_->SyncGetter<string16>( - &map_, object_id, name, &WebIDBObjectStore::name); -} - -void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnKeyPath( - int32 object_id, IndexedDBKeyPath* key_path) { - WebIDBObjectStore* idb_object_store = parent_->GetOrTerminateProcess( - &map_,object_id); - if (!idb_object_store) - return; - - *key_path = IndexedDBKeyPath(idb_object_store->keyPath()); -} - -void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnIndexNames( - int32 idb_object_store_id, std::vector<string16>* index_names) { - WebIDBObjectStore* idb_object_store = parent_->GetOrTerminateProcess( - &map_, idb_object_store_id); - if (!idb_object_store) - return; - - WebDOMStringList web_index_names = idb_object_store->indexNames(); - index_names->reserve(web_index_names.length()); - for (unsigned i = 0; i < web_index_names.length(); ++i) - index_names->push_back(web_index_names.item(i)); -} - -void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnAutoIncrement( - int32 idb_object_store_id, bool* auto_increment) { - parent_->SyncGetter<bool>(&map_, idb_object_store_id, auto_increment, - &WebIDBObjectStore::autoIncrement); -} - void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnGet( int idb_object_store_id, int32 thread_id, 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 c4537e8..07010d9 100644 --- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h +++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h @@ -119,10 +119,6 @@ class IndexedDBDispatcherHost : public content::BrowserMessageFilter { void OnMetadata(int32 idb_database_id, IndexedDBDatabaseMetadata* metadata); - void OnName(int32 idb_database_id, string16* name); - void OnVersion(int32 idb_database_id, string16* version); - void OnObjectStoreNames(int32 idb_database_id, - std::vector<string16>* object_stores); void OnCreateObjectStore( const IndexedDBHostMsg_DatabaseCreateObjectStore_Params& params, int32* object_store_id, WebKit::WebExceptionCode* ec); @@ -158,11 +154,6 @@ class IndexedDBDispatcherHost : public content::BrowserMessageFilter { bool OnMessageReceived(const IPC::Message& message, bool *msg_is_ok); void Send(IPC::Message* message); - void OnName(int32 idb_index_id, string16* name); - void OnStoreName(int32 idb_index_id, string16* store_name); - void OnKeyPath(int32 idb_index_id, content::IndexedDBKeyPath* key_path); - void OnUnique(int32 idb_index_id, bool* unique); - void OnMultiEntry(int32 idb_index_id, bool* multi_entry); void OnOpenObjectCursor( const IndexedDBHostMsg_IndexOpenCursor_Params& params, WebKit::WebExceptionCode* ec); @@ -196,12 +187,6 @@ class IndexedDBDispatcherHost : public content::BrowserMessageFilter { bool OnMessageReceived(const IPC::Message& message, bool *msg_is_ok); void Send(IPC::Message* message); - void OnName(int32 idb_object_store_id, string16* name); - void OnKeyPath(int32 idb_object_store_id, - content::IndexedDBKeyPath* keyPath); - void OnIndexNames(int32 idb_object_store_id, - std::vector<string16>* index_names); - void OnAutoIncrement(int32 idb_object_store_id, bool* auto_increment); void OnGet(int idb_object_store_id, int32 thread_id, int32 response_id, |