Proxy new WebData-based onSuccess() calls.

content/common/indexed_db/indexed_db_dispatcher.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/common/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/common/indexed_db/proxy_webidbcursor_impl.h"
 #include "content/common/indexed_db/proxy_webidbdatabase_impl.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseException.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
 
 using WebKit::WebDOMStringList;
 using WebKit::WebData;
 using WebKit::WebExceptionCode;
 using WebKit::WebFrame;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBDatabase;
 using WebKit::WebIDBDatabaseCallbacks;
 using WebKit::WebIDBDatabaseError;
 using WebKit::WebIDBKey;
@@ skipping 92 matching lines @@
       web_index_metadata.multiEntry = idb_index_metadata.multiEntry;
     }
   }
 
   return web_metadata;
 }
 
 void IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(IndexedDBDispatcher, msg)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBCursorOld,
+                        OnSuccessOpenCursorOld)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBCursor,
                         OnSuccessOpenCursor)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorAdvanceOld,
+                        OnSuccessCursorContinueOld)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorAdvance,
                         OnSuccessCursorContinue)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorContinueOld,
+                        OnSuccessCursorContinueOld)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorContinue,
                         OnSuccessCursorContinue)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorPrefetchOld,
+                        OnSuccessCursorPrefetchOld)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessCursorPrefetch,
                         OnSuccessCursorPrefetch)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBDatabase,
                         OnSuccessIDBDatabase)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIndexedDBKey,
                         OnSuccessIndexedDBKey)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessStringList,
                         OnSuccessStringList)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessSerializedScriptValue,
                         OnSuccessSerializedScriptValue)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessValue,
+                        OnSuccessValue)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessSerializedScriptValueWithKey,
                         OnSuccessSerializedScriptValueWithKey)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessValueWithKey,
+                        OnSuccessValueWithKey)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessInteger,
                         OnSuccessInteger)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessUndefined,
                         OnSuccessUndefined)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksError, OnError)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksIntBlocked, OnIntBlocked)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksUpgradeNeeded, OnUpgradeNeeded)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_DatabaseCallbacksForcedClose,
                         OnForcedClose)
     IPC_MESSAGE_HANDLER(IndexedDBMsg_DatabaseCallbacksIntVersionChange,
@@ skipping 395 matching lines @@
     int32 ipc_thread_id, int32 ipc_response_id,
     const SerializedScriptValue& value) {
   DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess(WebSerializedScriptValue(value));
   pending_callbacks_.Remove(ipc_response_id);
 }
 
+void IndexedDBDispatcher::OnSuccessValue(
+    int32 ipc_thread_id, int32 ipc_response_id,
+    const std::vector<char>& value) {
+  DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
+  WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
+  if (!callbacks)
+    return;
+  WebData web_value;
+  if (value.size())
+      web_value.assign(&value.front(), value.size());
+  callbacks->onSuccess(web_value);
+  pending_callbacks_.Remove(ipc_response_id);
+}
+
 void IndexedDBDispatcher::OnSuccessSerializedScriptValueWithKey(
     int32 ipc_thread_id, int32 ipc_response_id,
     const SerializedScriptValue& value,
     const IndexedDBKey& primary_key,
     const IndexedDBKeyPath& key_path) {
   DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess(WebSerializedScriptValue(value),
                        primary_key, key_path);
   pending_callbacks_.Remove(ipc_response_id);
 }
 
+void IndexedDBDispatcher::OnSuccessValueWithKey(
+    int32 ipc_thread_id, int32 ipc_response_id,
+    const std::vector<char>& value,
+    const IndexedDBKey& primary_key,
+    const IndexedDBKeyPath& key_path) {
+  DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
+  WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
+  if (!callbacks)
+    return;
+  WebData web_value;
+  if (value.size())
+      web_value.assign(&value.front(), value.size());
+  callbacks->onSuccess(web_value,
+                       primary_key, key_path);
+  pending_callbacks_.Remove(ipc_response_id);
+}
+
 void IndexedDBDispatcher::OnSuccessInteger(
     int32 ipc_thread_id, int32 ipc_response_id, int64 value) {
   DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess(value);
   pending_callbacks_.Remove(ipc_response_id);
 }
 
 void IndexedDBDispatcher::OnSuccessUndefined(
     int32 ipc_thread_id, int32 ipc_response_id) {
   DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
   if (!callbacks)
     return;
   callbacks->onSuccess();
   pending_callbacks_.Remove(ipc_response_id);
 }
 
-void IndexedDBDispatcher::OnSuccessOpenCursor(
-    const IndexedDBMsg_CallbacksSuccessIDBCursor_Params& p) {
+void IndexedDBDispatcher::OnSuccessOpenCursorOld(
+    const IndexedDBMsg_CallbacksSuccessIDBCursorOld_Params& p) {
   DCHECK_EQ(p.ipc_thread_id, CurrentWorkerId());
   int32 ipc_response_id = p.ipc_response_id;
   int32 ipc_object_id = p.ipc_cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
   const SerializedScriptValue& value = p.serialized_value;
 
   WebIDBCallbacks* callbacks =
       pending_callbacks_.Lookup(ipc_response_id);
   if (!callbacks)
     return;
 
   RendererWebIDBCursorImpl* cursor =
           new RendererWebIDBCursorImpl(ipc_object_id);
   cursors_[ipc_object_id] = cursor;
   callbacks->onSuccess(cursor, key, primary_key,
                        WebSerializedScriptValue(value));
 
   pending_callbacks_.Remove(ipc_response_id);
 }
 
-void IndexedDBDispatcher::OnSuccessCursorContinue(
-    const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p) {
+void IndexedDBDispatcher::OnSuccessOpenCursor(
+    const IndexedDBMsg_CallbacksSuccessIDBCursor_Params& p) {
+  DCHECK_EQ(p.ipc_thread_id, CurrentWorkerId());
+  int32 ipc_response_id = p.ipc_response_id;
+  int32 ipc_object_id = p.ipc_cursor_id;
+  const IndexedDBKey& key = p.key;
+  const IndexedDBKey& primary_key = p.primary_key;
+  WebData value;
+  if (p.value.size())
+      value.assign(&p.value.front(), p.value.size());
+
+  WebIDBCallbacks* callbacks =
+      pending_callbacks_.Lookup(ipc_response_id);
+  if (!callbacks)
+    return;
+
+  RendererWebIDBCursorImpl* cursor =
+          new RendererWebIDBCursorImpl(ipc_object_id);
+  cursors_[ipc_object_id] = cursor;
+  callbacks->onSuccess(cursor, key, primary_key, value);
+
+  pending_callbacks_.Remove(ipc_response_id);
+}
+
+void IndexedDBDispatcher::OnSuccessCursorContinueOld(
+    const IndexedDBMsg_CallbacksSuccessCursorContinueOld_Params& p) {
   DCHECK_EQ(p.ipc_thread_id, CurrentWorkerId());
   int32 ipc_response_id = p.ipc_response_id;
   int32 ipc_cursor_id = p.ipc_cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
   const SerializedScriptValue& value = p.serialized_value;
 
   RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
   DCHECK(cursor);
 
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
   if (!callbacks)
     return;
 
   callbacks->onSuccess(key, primary_key,
                        WebSerializedScriptValue(value));
 
   pending_callbacks_.Remove(ipc_response_id);
 }
 
+void IndexedDBDispatcher::OnSuccessCursorContinue(
+    const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p) {
+  DCHECK_EQ(p.ipc_thread_id, CurrentWorkerId());
+  int32 ipc_response_id = p.ipc_response_id;
+  int32 ipc_cursor_id = p.ipc_cursor_id;
+  const IndexedDBKey& key = p.key;
+  const IndexedDBKey& primary_key = p.primary_key;
+  const std::vector<char>& value = p.value;
+
+  RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
+  DCHECK(cursor);
+
+  WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
+  if (!callbacks)
+    return;
+
+  callbacks->onSuccess(key, primary_key, value);
+
+  pending_callbacks_.Remove(ipc_response_id);
+}
+
+void IndexedDBDispatcher::OnSuccessCursorPrefetchOld(
+    const IndexedDBMsg_CallbacksSuccessCursorPrefetchOld_Params& p) {
+  DCHECK_EQ(p.ipc_thread_id, CurrentWorkerId());
+  int32 ipc_response_id = p.ipc_response_id;
+  int32 ipc_cursor_id = p.ipc_cursor_id;
+  const std::vector<IndexedDBKey>& keys = p.keys;
+  const std::vector<IndexedDBKey>& primary_keys = p.primary_keys;
+  const std::vector<SerializedScriptValue>& values = p.values;
+  RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
+  DCHECK(cursor);
+  cursor->SetPrefetchDataOld(keys, primary_keys, values);
+
+  WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
+  DCHECK(callbacks);
+  cursor->CachedContinue(callbacks);
+  pending_callbacks_.Remove(ipc_response_id);
+}
+
 void IndexedDBDispatcher::OnSuccessCursorPrefetch(
     const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p) {
   DCHECK_EQ(p.ipc_thread_id, CurrentWorkerId());
   int32 ipc_response_id = p.ipc_response_id;
   int32 ipc_cursor_id = p.ipc_cursor_id;
   const std::vector<IndexedDBKey>& keys = p.keys;
   const std::vector<IndexedDBKey>& primary_keys = p.primary_keys;
-  const std::vector<SerializedScriptValue>& values = p.values;
+  std::vector<WebData> values(p.values.size());
+  for (size_t i = 0; i < p.values.size(); ++i) {
+      if (p.values[i].size())
+          values[i].assign(&p.values[i].front(), p.values[i].size());
+  }
   RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
   DCHECK(cursor);
   cursor->SetPrefetchData(keys, primary_keys, values);
 
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_response_id);
   DCHECK(callbacks);
   cursor->CachedContinue(callbacks);
   pending_callbacks_.Remove(ipc_response_id);
 }
 
@@ skipping 98 matching lines @@
     int32 ipc_exception_cursor_id) {
   typedef std::map<int32, RendererWebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == ipc_exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }
 
 }  // namespace content