Implement IDBDatabase::createObjectStore. Also refactor IndexedDBCallbacks.

chrome/browser/in_process_webkit/indexed_db_dispatcher_host.cc

 // Copyright (c) 2010 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 "chrome/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/in_process_webkit/indexed_db_callbacks.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBDatabaseError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBIndex.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebIDBObjectStore.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIndexedDatabase.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityOrigin.h"
 
 using WebKit::WebDOMStringList;
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBIndex;
+using WebKit::WebIDBObjectStore;
 using WebKit::WebSecurityOrigin;
 
 IndexedDBDispatcherHost::IndexedDBDispatcherHost(
     IPC::Message::Sender* sender, WebKitContext* webkit_context)
     : sender_(sender),
       webkit_context_(webkit_context),
       ALLOW_THIS_IN_INITIALIZER_LIST(database_dispatcher_host_(
           new DatabaseDispatcherHost(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(index_dispatcher_host_(
           new IndexDispatcherHost(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(object_store_dispatcher_host_(
+          new ObjectStoreDispatcherHost(this))),
       process_handle_(0) {
   DCHECK(sender_);
   DCHECK(webkit_context_.get());
 }
 
 IndexedDBDispatcherHost::~IndexedDBDispatcherHost() {
 }
 
 void IndexedDBDispatcherHost::Init(int process_id,
                                    base::ProcessHandle process_handle) {
@@ skipping 26 matching lines @@
 
 bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   DCHECK(process_handle_);
 
   switch (message.type()) {
     case ViewHostMsg_IndexedDatabaseOpen::ID:
     case ViewHostMsg_IDBDatabaseName::ID:
     case ViewHostMsg_IDBDatabaseDescription::ID:
     case ViewHostMsg_IDBDatabaseVersion::ID:
+    case ViewHostMsg_IDBDatabaseCreateObjectStore::ID:
     case ViewHostMsg_IDBDatabaseObjectStores::ID:
     case ViewHostMsg_IDBDatabaseDestroyed::ID:
     case ViewHostMsg_IDBIndexName::ID:
     case ViewHostMsg_IDBIndexKeyPath::ID:
     case ViewHostMsg_IDBIndexUnique::ID:
     case ViewHostMsg_IDBIndexDestroyed::ID:
+    case ViewHostMsg_IDBObjectStoreName::ID:
+    case ViewHostMsg_IDBObjectStoreKeyPath::ID:
+    case ViewHostMsg_IDBObjectStoreDestroyed::ID:
       break;
     default:
       return false;
   }
 
   bool success = ChromeThread::PostTask(
       ChromeThread::WEBKIT, FROM_HERE, NewRunnableMethod(
           this, &IndexedDBDispatcherHost::OnMessageReceivedWebKit, message));
   DCHECK(success);
   return true;
@@ skipping 22 matching lines @@
 }
 
 void IndexedDBDispatcherHost::OnMessageReceivedWebKit(
     const IPC::Message& message) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
   DCHECK(process_handle_);
 
   bool msg_is_ok = true;
   bool handled =
       database_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
-      index_dispatcher_host_->OnMessageReceived(message, &msg_is_ok);
+      index_dispatcher_host_->OnMessageReceived(message, &msg_is_ok) ||
+      object_store_dispatcher_host_->OnMessageReceived(message, &msg_is_ok);
 
   if (!handled) {
     IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost, message, msg_is_ok)
       IPC_MESSAGE_HANDLER(ViewHostMsg_IndexedDatabaseOpen,
                           OnIndexedDatabaseOpen)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
   }
 
   DCHECK(handled);
   if (!msg_is_ok) {
     BrowserRenderProcessHost::BadMessageTerminateProcess(message.type(),
                                                          process_handle_);
   }
 }
 
-int32 IndexedDBDispatcherHost::AddIDBDatabase(WebIDBDatabase* idb_database) {
+int32 IndexedDBDispatcherHost::Add(WebIDBDatabase* idb_database) {
   return database_dispatcher_host_->map_.Add(idb_database);
 }
 
-class IndexedDatabaseOpenCallbacks : public IndexedDBCallbacks {
- public:
-  IndexedDatabaseOpenCallbacks(IndexedDBDispatcherHost* parent,
-                               int32 response_id)
-      : IndexedDBCallbacks(parent, response_id) {
-  }
-
-  virtual void onError(const WebIDBDatabaseError& error) {
-    parent()->Send(new ViewMsg_IndexedDatabaseOpenError(
-        response_id(), error.code(), error.message()));
-  }
-
-  virtual void onSuccess(WebIDBDatabase* idb_database) {
-    int32 idb_database_id = parent()->AddIDBDatabase(idb_database);
-    parent()->Send(new ViewMsg_IndexedDatabaseOpenSuccess(response_id(),
-                                                          idb_database_id));
-  }
-};
+int32 IndexedDBDispatcherHost::Add(WebIDBObjectStore* idb_object_store) {
+  return object_store_dispatcher_host_->map_.Add(idb_object_store);
+}
 
 void IndexedDBDispatcherHost::OnIndexedDatabaseOpen(
     const ViewHostMsg_IndexedDatabaseOpen_Params& params) {
   // TODO(jorlow): Check the content settings map and use params.routing_id_
   //               if it's necessary to ask the user for permission.
 
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
   Context()->GetIndexedDatabase()->open(
       params.name_, params.description_,
-      new IndexedDatabaseOpenCallbacks(this, params.response_id_),
+      new IndexedDBCallbacks<WebIDBDatabase,
+                             ViewMsg_IndexedDatabaseOpenSuccess,
+                             ViewMsg_IndexedDatabaseOpenError>(
+                             this, params.response_id_),
       WebSecurityOrigin::createFromDatabaseIdentifier(params.origin_), NULL);
 }
 
 
 //////////////////////////////////////////////////////////////////////
 // Helper templates.
 //
 
 template <typename ObjectType>
 ObjectType* IndexedDBDispatcherHost::GetOrTerminateProcess(
     IDMap<ObjectType, IDMapOwnPointer>* map, int32 return_object_id,
     IPC::Message* reply_msg, uint32 message_type) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
   ObjectType* return_object = map->Lookup(return_object_id);
   if (!return_object) {
     BrowserRenderProcessHost::BadMessageTerminateProcess(message_type,
                                                          process_handle_);
-    if (reply_msg)
-      delete reply_msg;
+    delete reply_msg;
   }
   return return_object;
 }
 
 template <typename ReplyType, typename MessageType,
           typename MapObjectType, typename Method>
 void IndexedDBDispatcherHost::SyncGetter(
     IDMap<MapObjectType, IDMapOwnPointer>* map, int32 object_id,
     IPC::Message* reply_msg, Method method) {
   MapObjectType* object = GetOrTerminateProcess(map, object_id, reply_msg,
@@ skipping 31 matching lines @@
     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_DELAY_REPLY(ViewHostMsg_IDBDatabaseName, OnName)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseDescription,
                                     OnDescription)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseVersion, OnVersion)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBDatabaseObjectStores,
                                     OnObjectStores)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_IDBDatabaseCreateObjectStore,
+                        OnCreateObjectStore)
     IPC_MESSAGE_HANDLER(ViewHostMsg_IDBDatabaseDestroyed, OnDestroyed)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void IndexedDBDispatcherHost::DatabaseDispatcherHost::Send(
     IPC::Message* message) {
   // The macro magic in OnMessageReceived requires this to link, but it should
   // never actually be called.
@@ skipping 29 matching lines @@
 
   WebDOMStringList web_object_stores = idb_database->objectStores();
   std::vector<string16> object_stores;
   for (unsigned i = 0; i < web_object_stores.length(); ++i)
     object_stores[i] = web_object_stores.item(i);
   ViewHostMsg_IDBDatabaseObjectStores::WriteReplyParams(reply_msg,
                                                         object_stores);
   parent_->Send(reply_msg);
 }
 
+void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnCreateObjectStore(
+    const ViewHostMsg_IDBDatabaseCreateObjectStore_Params& params) {
+  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
+  WebIDBDatabase* idb_database = parent_->GetOrTerminateProcess(
+      &map_, params.idb_database_id_, NULL,
+      ViewHostMsg_IDBDatabaseObjectStores::ID);
+  if (!idb_database)
+    return;
+  idb_database->createObjectStore(
+      params.name_, params.keypath_, params.auto_increment_,
+      new IndexedDBCallbacks<WebIDBObjectStore,
+                             ViewMsg_IDBDatabaseCreateObjectStoreSuccess,
+                             ViewMsg_IDBDatabaseCreateObjectStoreError>(
+                             parent_, params.response_id_));
+}
+
 void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnDestroyed(
     int32 object_id) {
   parent_->DestroyObject(&map_, object_id,
                          ViewHostMsg_IDBDatabaseDestroyed::ID);
 }
 
 
 //////////////////////////////////////////////////////////////////////
 // IndexedDBDispatcherHost::IndexDispatcherHost
 //
@@ skipping 43 matching lines @@
 void IndexedDBDispatcherHost::IndexDispatcherHost::OnUnique(
     int32 object_id, IPC::Message* reply_msg) {
   parent_->SyncGetter<bool, ViewHostMsg_IDBIndexUnique>(
       &map_, object_id, reply_msg, &WebIDBIndex::unique);
 }
 
 void IndexedDBDispatcherHost::IndexDispatcherHost::OnDestroyed(
     int32 object_id) {
   parent_->DestroyObject(&map_, object_id, ViewHostMsg_IDBIndexDestroyed::ID);
 }
+
+//////////////////////////////////////////////////////////////////////
+// IndexedDBDispatcherHost::ObjectStoreDispatcherHost
+//
+
+IndexedDBDispatcherHost::ObjectStoreDispatcherHost::ObjectStoreDispatcherHost(
+    IndexedDBDispatcherHost* parent)
+    : parent_(parent) {
+}
+
+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_DELAY_REPLY(ViewHostMsg_IDBObjectStoreName, OnName)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_IDBObjectStoreKeyPath,
+                                    OnKeyPath)
+    IPC_MESSAGE_HANDLER(ViewHostMsg_IDBObjectStoreDestroyed, OnDestroyed)
+    IPC_MESSAGE_UNHANDLED(handled = false)
+  IPC_END_MESSAGE_MAP()
+  return handled;
+}
+
+void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::Send(
+    IPC::Message* message) {
+  // The macro magic in OnMessageReceived requires this to link, but it should
+  // never actually be called.
+  NOTREACHED();
+  parent_->Send(message);
+}
+
+void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnName(
+    int32 object_id, IPC::Message* reply_msg) {
+  parent_->SyncGetter<string16, ViewHostMsg_IDBObjectStoreName>(
+      &map_, object_id, reply_msg, &WebIDBObjectStore::name);
+}
+
+void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnKeyPath(
+    int32 object_id, IPC::Message* reply_msg) {
+  parent_->SyncGetter<string16, ViewHostMsg_IDBObjectStoreKeyPath>(
+      &map_, object_id, reply_msg, &WebIDBObjectStore::keyPath);
+}
+
+void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnDestroyed(
+    int32 object_id) {
+  parent_->DestroyObject(
+      &map_, object_id, ViewHostMsg_IDBObjectStoreDestroyed::ID);
+}