Add the transaction id plumbing to IndexedDB.

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/3478003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60275 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 29 insertions, 13 deletions

diff --git a/chrome/renderer/renderer_webidbindex_impl.cc b/chrome/renderer/renderer_webidbindex_impl.cc
index 5fa4115..de3eda5 100644
--- a/chrome/renderer/renderer_webidbindex_impl.cc
+++ b/chrome/renderer/renderer_webidbindex_impl.cc
@@ -8,6 +8,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
+#include "chrome/renderer/renderer_webidbtransaction_impl.h"
 
 using WebKit::WebDOMStringList;
 using WebKit::WebString;
@@ -55,34 +56,49 @@ bool RendererWebIDBIndexImpl::unique() const {
 void RendererWebIDBIndexImpl::openObjectCursor(
     const WebKit::WebIDBKeyRange& range,
     unsigned short direction,
-    WebKit::WebIDBCallbacks* callbacks) {
+    WebKit::WebIDBCallbacks* callbacks,
+    const WebKit::WebIDBTransaction& transaction) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBIndexOpenObjectCursor(range, direction,
-                                              callbacks,  idb_index_id_);
+  int transaction_id =
+      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
+  dispatcher->RequestIDBIndexOpenObjectCursor(
+      range, direction, callbacks,  idb_index_id_, transaction_id);
 }
 
 void RendererWebIDBIndexImpl::openCursor(
     const WebKit::WebIDBKeyRange& range,
     unsigned short direction,
-    WebKit::WebIDBCallbacks* callbacks) {
+    WebKit::WebIDBCallbacks* callbacks,
+    const WebKit::WebIDBTransaction& transaction) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBIndexOpenCursor(range, direction,
-                                        callbacks,  idb_index_id_);
+  int transaction_id =
+      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
+  dispatcher->RequestIDBIndexOpenCursor(
+      range, direction, callbacks,  idb_index_id_, transaction_id);
 }
 
-void RendererWebIDBIndexImpl::getObject(const WebKit::WebIDBKey& key,
-                                        WebKit::WebIDBCallbacks* callbacks) {
+void RendererWebIDBIndexImpl::getObject(
+    const WebKit::WebIDBKey& key,
+    WebKit::WebIDBCallbacks* callbacks,
+    const WebKit::WebIDBTransaction& transaction) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBIndexGetObject(IndexedDBKey(key), callbacks,
-                                       idb_index_id_);
+  int transaction_id =
+      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
+  dispatcher->RequestIDBIndexGetObject(
+      IndexedDBKey(key), callbacks, idb_index_id_, transaction_id);
 }
 
-void RendererWebIDBIndexImpl::get(const WebKit::WebIDBKey& key,
-                                  WebKit::WebIDBCallbacks* callbacks) {
+void RendererWebIDBIndexImpl::get(
+    const WebKit::WebIDBKey& key,
+    WebKit::WebIDBCallbacks* callbacks,
+    const WebKit::WebIDBTransaction& transaction) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
-  dispatcher->RequestIDBIndexGet(IndexedDBKey(key), callbacks,  idb_index_id_);
+  int transaction_id =
+      static_cast<const RendererWebIDBTransactionImpl*>(&transaction)->id();
+  dispatcher->RequestIDBIndexGet(
+      IndexedDBKey(key), callbacks,  idb_index_id_, transaction_id);
 }