Chromium side of "consolidate two-phase connection to avoid race conditions".

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"
@@ skipping 180 matching lines @@
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   Send(new IndexedDBHostMsg_CursorDelete(idb_cursor_id, CurrentWorkerId(),
                                          response_id, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
 
+// TODO(jsbell): Remove this overload once WK90411 rolls.
 void IndexedDBDispatcher::RequestIDBFactoryOpen(
     const string16& name,
     int64 version,
     WebIDBCallbacks* callbacks_ptr,
     const string16& origin,
     WebFrame* web_frame) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   if (!CurrentWorkerId() &&
       !ChildThread::current()->IsWebFrameValid(web_frame))
     return;
 
   IndexedDBHostMsg_FactoryOpen_Params params;
   params.thread_id = CurrentWorkerId();
   params.response_id = pending_callbacks_.Add(callbacks.release());
+  params.database_response_id = 0;  // Unused in this message.
   params.origin = origin;
   params.name = name;
   params.version = version;
+  Send(new IndexedDBHostMsg_FactoryOpenLegacy(params));
+}
+
+void IndexedDBDispatcher::RequestIDBFactoryOpen(
+    const string16& name,
+    int64 version,
+    WebIDBCallbacks* callbacks_ptr,
+    WebIDBDatabaseCallbacks* database_callbacks_ptr,
+    const string16& origin,
+    WebFrame* web_frame) {
+  ResetCursorPrefetchCaches();
+  scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
+  scoped_ptr<WebIDBDatabaseCallbacks>
+      database_callbacks(database_callbacks_ptr);
+
+  if (!CurrentWorkerId() &&
+      !ChildThread::current()->IsWebFrameValid(web_frame))
+    return;
+
+  IndexedDBHostMsg_FactoryOpen_Params params;
+  params.thread_id = CurrentWorkerId();
+  params.response_id = pending_callbacks_.Add(callbacks.release());
+  params.database_response_id = pending_database_callbacks_.Add(
+      database_callbacks.release());
+  params.origin = origin;
+  params.name = name;
+  params.version = version;
   Send(new IndexedDBHostMsg_FactoryOpen(params));
 }
 
 void IndexedDBDispatcher::RequestIDBFactoryGetDatabaseNames(
     WebIDBCallbacks* callbacks_ptr,
     const string16& origin,
     WebFrame* web_frame) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
@@ skipping 30 matching lines @@
 
 void IndexedDBDispatcher::RequestIDBDatabaseClose(int32 idb_database_id) {
   ResetCursorPrefetchCaches();
   Send(new IndexedDBHostMsg_DatabaseClose(idb_database_id));
   // There won't be pending database callbacks if the transaction was aborted in
   // the initial upgradeneeded event handler.
   if (pending_database_callbacks_.Lookup(idb_database_id))
     pending_database_callbacks_.Remove(idb_database_id);
 }
 
+// TODO(jsbell): Remove once WK90411 has rolled.
 void IndexedDBDispatcher::RequestIDBDatabaseOpen(
-      WebIDBDatabaseCallbacks* callbacks_ptr,
-      int32 idb_database_id) {
+    WebIDBDatabaseCallbacks* callbacks_ptr,
+    int32 idb_database_id) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBDatabaseCallbacks> callbacks(callbacks_ptr);
 
   DCHECK(!pending_database_callbacks_.Lookup(idb_database_id));
   pending_database_callbacks_.AddWithID(callbacks.release(), idb_database_id);
   Send(new IndexedDBHostMsg_DatabaseOpen(idb_database_id, CurrentWorkerId(),
                                          idb_database_id));
 }
 
 void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(
@@ skipping 487 matching lines @@
 }
 
 void IndexedDBDispatcher::ResetCursorPrefetchCaches(int32 exception_cursor_id) {
   typedef std::map<int32, RendererWebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }