IndexedDB: Remove IPC plumbing for obsolete property accessors.

content/browser/in_process_webkit/indexed_db_dispatcher_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/in_process_webkit/indexed_db_callbacks.h"
@@ skipping 309 matching lines @@
     parent_->Context()->ConnectionClosed(iter->second);
   }
 }
 
 bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* msg_is_ok) {
   bool handled = true;
   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,
                         OnDeleteObjectStore)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseSetVersion, OnSetVersion)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseTransaction, OnTransaction)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseClose, OnClose)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseOpen, OnOpen)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseDestroyed, OnDestroyed)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ skipping 32 matching lines @@
       idb_index_metadata.name = web_index_metadata.name;
       idb_index_metadata.keyPath = IndexedDBKeyPath(web_index_metadata.keyPath);
       idb_index_metadata.unique = web_index_metadata.unique;
       idb_index_metadata.multiEntry = web_index_metadata.multiEntry;
       idb_store_metadata.indexes.push_back(idb_index_metadata);
     }
     metadata->object_stores.push_back(idb_store_metadata);
   }
 }
 
-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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   WebIDBDatabase* idb_database = parent_->GetOrTerminateProcess(
       &map_, params.idb_database_id);
   WebIDBTransaction* idb_transaction = parent_->GetOrTerminateProcess(
       &parent_->transaction_dispatcher_host_->map_, params.transaction_id);
   if (!idb_database || !idb_transaction)
     return;
@@ skipping 111 matching lines @@
 }
 
 IndexedDBDispatcherHost::IndexDispatcherHost::~IndexDispatcherHost() {
 }
 
 bool IndexedDBDispatcherHost::IndexDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* msg_is_ok) {
   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)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexCount, OnCount)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexGetObject, OnGetObject)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexGetKey, OnGetKey)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_IndexDestroyed, OnDestroyed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void IndexedDBDispatcherHost::IndexDispatcherHost::Send(
     IPC::Message* message) {
   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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   WebIDBIndex* idb_index = parent_->GetOrTerminateProcess(
       &map_, params.idb_index_id);
   WebIDBTransaction* idb_transaction = parent_->GetOrTerminateProcess(
       &parent_->transaction_dispatcher_host_->map_, params.transaction_id);
   if (!idb_transaction || !idb_index)
     return;
@@ skipping 107 matching lines @@
 
 IndexedDBDispatcherHost::
 ObjectStoreDispatcherHost::~ObjectStoreDispatcherHost() {
 }
 
 bool IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* msg_is_ok) {
   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)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreClear, OnClear)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreCreateIndex, OnCreateIndex)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreIndex, OnIndex)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreDeleteIndex, OnDeleteIndex)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreOpenCursor, OnOpenCursor)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreCount, OnCount)
     IPC_MESSAGE_HANDLER(IndexedDBHostMsg_ObjectStoreDestroyed, OnDestroyed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::Send(
     IPC::Message* message) {
   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,
     int32 response_id,
     const IndexedDBKeyRange& key_range,
     int32 transaction_id,
     WebKit::WebExceptionCode* ec) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT_DEPRECATED));
   WebIDBObjectStore* idb_object_store = parent_->GetOrTerminateProcess(
       &map_, idb_object_store_id);
@@ skipping 449 matching lines @@
   }
   idb_transaction->didCompleteTaskEvents();
 }
 
 void IndexedDBDispatcherHost::TransactionDispatcherHost::OnDestroyed(
     int32 object_id) {
   transaction_size_map_.erase(object_id);
   transaction_url_map_.erase(object_id);
   parent_->DestroyObject(&map_, object_id);
 }