| Index: content/browser/indexed_db/indexed_db_dispatcher_host.cc
|
| ===================================================================
|
| --- content/browser/indexed_db/indexed_db_dispatcher_host.cc (revision 271040)
|
| +++ content/browser/indexed_db/indexed_db_dispatcher_host.cc (working copy)
|
| @@ -124,21 +124,19 @@
|
| return NULL;
|
| }
|
|
|
| -bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message,
|
| - bool* message_was_ok) {
|
| +bool IndexedDBDispatcherHost::OnMessageReceived(const IPC::Message& message) {
|
| if (IPC_MESSAGE_CLASS(message) != IndexedDBMsgStart)
|
| return false;
|
|
|
| DCHECK(indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread() ||
|
| message.type() == IndexedDBHostMsg_DatabasePut::ID);
|
|
|
| - bool handled =
|
| - database_dispatcher_host_->OnMessageReceived(message, message_was_ok) ||
|
| - cursor_dispatcher_host_->OnMessageReceived(message, message_was_ok);
|
| + bool handled = database_dispatcher_host_->OnMessageReceived(message) ||
|
| + cursor_dispatcher_host_->OnMessageReceived(message);
|
|
|
| if (!handled) {
|
| handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP_EX(IndexedDBDispatcherHost, message, *message_was_ok)
|
| + IPC_BEGIN_MESSAGE_MAP(IndexedDBDispatcherHost, message)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_FactoryGetDatabaseNames,
|
| OnIDBFactoryGetDatabaseNames)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_FactoryOpen, OnIDBFactoryOpen)
|
| @@ -462,16 +460,15 @@
|
| }
|
|
|
| bool IndexedDBDispatcherHost::DatabaseDispatcherHost::OnMessageReceived(
|
| - const IPC::Message& message,
|
| - bool* msg_is_ok) {
|
| + const IPC::Message& message) {
|
|
|
| DCHECK(
|
| (message.type() == IndexedDBHostMsg_DatabasePut::ID) ||
|
| parent_->indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread());
|
|
|
| bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP_EX(
|
| - IndexedDBDispatcherHost::DatabaseDispatcherHost, message, *msg_is_ok)
|
| + IPC_BEGIN_MESSAGE_MAP(
|
| + IndexedDBDispatcherHost::DatabaseDispatcherHost, message)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseCreateObjectStore,
|
| OnCreateObjectStore)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_DatabaseDeleteObjectStore,
|
| @@ -882,11 +879,10 @@
|
| IndexedDBDispatcherHost::CursorDispatcherHost::~CursorDispatcherHost() {}
|
|
|
| bool IndexedDBDispatcherHost::CursorDispatcherHost::OnMessageReceived(
|
| - const IPC::Message& message,
|
| - bool* msg_is_ok) {
|
| + const IPC::Message& message) {
|
| bool handled = true;
|
| - IPC_BEGIN_MESSAGE_MAP_EX(
|
| - IndexedDBDispatcherHost::CursorDispatcherHost, message, *msg_is_ok)
|
| + IPC_BEGIN_MESSAGE_MAP(
|
| + IndexedDBDispatcherHost::CursorDispatcherHost, message)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorAdvance, OnAdvance)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorContinue, OnContinue)
|
| IPC_MESSAGE_HANDLER(IndexedDBHostMsg_CursorPrefetch, OnPrefetch)
|
|
|