Dispatch IndexedDB IPC messages to worker threads

content/renderer/renderer_webidbdatabase_impl.cc

 // Copyright (c) 2011 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/renderer/renderer_webidbdatabase_impl.h"
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webidbobjectstore_impl.h"
 #include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+#include "webkit/glue/worker_task_runner.h"
 
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
 using WebKit::WebFrame;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBDatabaseCallbacks;
 using WebKit::WebIDBTransaction;
 using WebKit::WebString;
 using WebKit::WebVector;
+using webkit_glue::WorkerTaskRunner;
 
 RendererWebIDBDatabaseImpl::RendererWebIDBDatabaseImpl(int32 idb_database_id)
     : idb_database_id_(idb_database_id) {
 }
 
 RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
   // It's not possible for there to be pending callbacks that address this
   // object since inside WebKit, they hold a reference to the object which owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
@@ skipping 57 matching lines @@
       new IndexedDBHostMsg_DatabaseDeleteObjectStore(
           idb_database_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
 
 void RendererWebIDBDatabaseImpl::setVersion(
     const WebString& version,
     WebIDBCallbacks* callbacks,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThreadImpl::current()->indexed_db_dispatcher();
+      IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBDatabaseSetVersion(
       version, callbacks, idb_database_id_, &ec);
 }
 
 WebKit::WebIDBTransaction* RendererWebIDBDatabaseImpl::transaction(
     const WebDOMStringList& names,
     unsigned short mode,
     WebExceptionCode& ec) {
   std::vector<string16> object_stores;
   object_stores.reserve(names.length());
   for (unsigned int i = 0; i < names.length(); ++i)
     object_stores.push_back(names.item(i));
 
   int transaction_id;
-  ChildThread::current()->Send(
-      new IndexedDBHostMsg_DatabaseTransaction(
-          idb_database_id_, object_stores, mode,
-          &transaction_id, &ec));
+  ChildThread::current()->Send(new IndexedDBHostMsg_DatabaseTransaction(
+      WorkerTaskRunner::Instance()->CurrentWorkerId(),
+      idb_database_id_, object_stores, mode, &transaction_id, &ec));
   if (!transaction_id)
     return NULL;
   return new RendererWebIDBTransactionImpl(transaction_id);
 }
 
 void RendererWebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
-      RenderThreadImpl::current()->indexed_db_dispatcher();
+      IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBDatabaseClose(idb_database_id_);
 }
 
 void RendererWebIDBDatabaseImpl::open(WebIDBDatabaseCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      RenderThreadImpl::current()->indexed_db_dispatcher();
+      IndexedDBDispatcher::ThreadSpecificInstance();
+  DCHECK(dispatcher);
   dispatcher->RequestIDBDatabaseOpen(callbacks, idb_database_id_);
 }