Chrome side changes for integer versions

content/common/indexed_db/indexed_db_dispatcher.h

 // 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.
 
 #ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/nullable_string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
 #include "webkit/glue/worker_task_runner.h"
 
 struct IndexedDBMsg_CallbacksSuccessCursorContinue_Params;
 struct IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params;
 struct IndexedDBMsg_CallbacksSuccessIDBCursor_Params;
 class RendererWebIDBCursorImpl;
+class RendererWebIDBDatabaseImpl;
 
 namespace IPC {
 class Message;
 }
 
 namespace WebKit {
 class WebFrame;
 class WebIDBKeyRange;
 class WebIDBTransaction;
 }
@@ skipping 25 matching lines @@
   void OnMessageReceived(const IPC::Message& msg);
   static bool Send(IPC::Message* msg);
 
   void RequestIDBFactoryGetDatabaseNames(
       WebKit::WebIDBCallbacks* callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame);
 
   void RequestIDBFactoryOpen(
       const string16& name,
+      int64 version,
       WebKit::WebIDBCallbacks* callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame);
 
   void RequestIDBFactoryDeleteDatabase(
       const string16& name,
       WebKit::WebIDBCallbacks* callbacks,
       const string16& origin,
       WebKit::WebFrame* web_frame);
 
@@ skipping 123 matching lines @@
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RegisterWebIDBTransactionCallbacks(
       WebKit::WebIDBTransactionCallbacks* callbacks,
       int32 id);
 
   void CursorDestroyed(int32 cursor_id);
+  void DatabaseDestroyed(int32 database_id);
 
   static int32 TransactionId(const WebKit::WebIDBTransaction& transaction);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, ValueSizeTest);
 
   // IDBCallback message handlers.
   void OnSuccessNull(int32 response_id);
   void OnSuccessIDBDatabase(int32 thread_id,
                             int32 response_id,
@@ skipping 15 matching lines @@
                            const std::vector<string16>& value);
   void OnSuccessSerializedScriptValue(
       int32 thread_id,
       int32 response_id,
       const content::SerializedScriptValue& value);
   void OnError(int32 thread_id,
                int32 response_id,
                int code,
                const string16& message);
   void OnBlocked(int32 thread_id, int32 response_id);
+  void OnIntBlocked(int32 thread_id, int32 response_id, int64 existing_version);
   void OnAbort(int32 thread_id, int32 transaction_id);
   void OnComplete(int32 thread_id, int32 transaction_id);
   void OnVersionChange(int32 thread_id,
                        int32 database_id,
                        const string16& newVersion);
+  void OnIntVersionChange(int32 thread_id,
+                          int32 database_id,
+                          int64 old_version,
+                          int64 new_version);
+  void OnUpgradeNeeded(int32 thread_id,

[jsbell, 2012/07/25 22:12:16]

Should group with other events headed back to an an IDBRequest (i.e. those being
routed with a response_id)

[dgrogan, 2012/07/25 23:59:59]

Done.

+                       int32 response_id,
+                       int32 transaction_id,
+                       int32 database_id,
+                       int64 old_version);
 
   // Reset cursor prefetch caches for all cursors except exception_cursor_id.
   void ResetCursorPrefetchCaches(int32 exception_cursor_id = -1);
 
   // Careful! WebIDBCallbacks wraps non-threadsafe data types. It must be
   // destroyed and used on the same thread it was created on.
   IDMap<WebKit::WebIDBCallbacks, IDMapOwnPointer> pending_callbacks_;
   IDMap<WebKit::WebIDBTransactionCallbacks, IDMapOwnPointer>
       pending_transaction_callbacks_;
   IDMap<WebKit::WebIDBDatabaseCallbacks, IDMapOwnPointer>
       pending_database_callbacks_;
 
   // Map from cursor id to RendererWebIDBCursorImpl.
   std::map<int32, RendererWebIDBCursorImpl*> cursors_;
 
+  std::map<int32, RendererWebIDBDatabaseImpl*> databases_;
+
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 #endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_