Chrome side changes for integer versions

content/browser/in_process_webkit/indexed_db_callbacks.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_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 class IndexedDBMsg_CallbacksSuccessIDBDatabase;
 class IndexedDBMsg_CallbacksSuccessIDBTransaction;
+class IndexedDBMsg_CallbacksUpgradeNeeded;
 
 // Template magic to figure out what message to send to the renderer based on
 // which (overloaded) onSuccess method we expect to be called.
 template <class Type> struct WebIDBToMsgHelper { };
 template <> struct WebIDBToMsgHelper<WebKit::WebIDBDatabase> {
   typedef IndexedDBMsg_CallbacksSuccessIDBDatabase MsgType;
 };
 template <> struct WebIDBToMsgHelper<WebKit::WebIDBTransaction> {
   typedef IndexedDBMsg_CallbacksSuccessIDBTransaction MsgType;
 };
 
+namespace {
+int32 kDatabaseNotAdded = -1;
+}
+
 // The code the following two classes share.
 class IndexedDBCallbacksBase : public WebKit::WebIDBCallbacks {
  public:
   IndexedDBCallbacksBase(IndexedDBDispatcherHost* dispatcher_host,
                          int32 thread_id,
                          int32 response_id);
 
   virtual ~IndexedDBCallbacksBase();
 
   virtual void onError(const WebKit::WebIDBDatabaseError& error);
   virtual void onBlocked();
+  virtual void onBlocked(long long old_version);
 
  protected:
   IndexedDBDispatcherHost* dispatcher_host() const {
     return dispatcher_host_.get();
   }
   int32 thread_id() const { return thread_id_; }
   int32 response_id() const { return response_id_; }
 
  private:
   scoped_refptr<IndexedDBDispatcherHost> dispatcher_host_;
   int32 response_id_;
   int32 thread_id_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacksBase);
 };
 
 // A WebIDBCallbacks implementation that returns an object of WebObjectType.
 template <class WebObjectType>
 class IndexedDBCallbacks : public IndexedDBCallbacksBase {
  public:
   IndexedDBCallbacks(
       IndexedDBDispatcherHost* dispatcher_host,
       int32 thread_id,
       int32 response_id,
       const GURL& origin_url)
       : IndexedDBCallbacksBase(dispatcher_host, thread_id, response_id),
-    origin_url_(origin_url) {
+    origin_url_(origin_url),
+    database_id_(kDatabaseNotAdded) {
   }
 
   virtual void onSuccess(WebObjectType* idb_object) {
-    int32 object_id = dispatcher_host()->Add(idb_object, thread_id(),
-                                             origin_url_);
+    int32 object_id = database_id_;
+    if (object_id == kDatabaseNotAdded) {
+      object_id = dispatcher_host()->Add(idb_object, thread_id(), origin_url_);
+    } else {
+      // We already have this database and don't need a new copy of it.
+      delete idb_object;

[dgrogan, 2012/07/25 20:26:11]

A better fix might be to add a map to IDBCallbacksProxy.cpp that would prevent a
new WebIDBDatabaseImpl from being instantiated.  See
https://bugs.webkit.org/attachment.cgi?id=153651&action=review#line1383

[dgrogan, 2012/07/25 20:27:09]

That link to IDBCallbacksProxy doesn't actually implement the map, it's just for
context.

+    }
+
     dispatcher_host()->Send(
         new typename WebIDBToMsgHelper<WebObjectType>::MsgType(thread_id(),
                                                                response_id(),
                                                                object_id));
   }
 
+  void onUpgradeNeeded(
+      long long old_version,
+      WebKit::WebIDBTransaction* transaction,
+      WebKit::WebIDBDatabase* database) {
+    NOTREACHED();
+  }
+
+
  private:
   GURL origin_url_;
+  int32 database_id_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
 // WebIDBCursor uses onSuccess(WebIDBCursor*) when a cursor has been opened,
 // onSuccessWithContinuation() when a continue() call has succeeded, or
 // onSuccess(SerializedScriptValue::nullValue()) to indicate it does
 // not contain any data, i.e., there is no key within the key range,
 // or it has reached the end.
 template <>
 class IndexedDBCallbacks<WebKit::WebIDBCursor>
@@ skipping 75 matching lines @@
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value);
   virtual void onSuccess(const WebKit::WebSerializedScriptValue& value,
                          const WebKit::WebIDBKey& key,
                          const WebKit::WebIDBKeyPath& keyPath);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(IndexedDBCallbacks);
 };
 
 #endif  // CONTENT_BROWSER_IN_PROCESS_WEBKIT_INDEXED_DB_CALLBACKS_H_