Change some IndexedDBCallbacks<> specializations to derived classes

content/browser/in_process_webkit/indexed_db_callbacks.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/browser/in_process_webkit/indexed_db_callbacks.h"
 
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "webkit/quota/quota_manager.h"
 
 using content::IndexedDBKey;
 using content::IndexedDBKeyPath;
 using content::SerializedScriptValue;
 
+namespace {
+int32 kDatabaseNotAdded = -1;

[jsbell, 2012/08/29 15:50:07]

const?

[dgrogan, 2012/08/29 18:43:23]

Done.

+}
+
 IndexedDBCallbacksBase::IndexedDBCallbacksBase(
     IndexedDBDispatcherHost* dispatcher_host,
     int32 thread_id,
     int32 response_id)
     : dispatcher_host_(dispatcher_host),
       response_id_(response_id),
       thread_id_(thread_id) {
 }
 
 IndexedDBCallbacksBase::~IndexedDBCallbacksBase() {}
 
 void IndexedDBCallbacksBase::onError(const WebKit::WebIDBDatabaseError& error) {
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksError(
       thread_id_, response_id_, error.code(), error.message()));
 }
 
 void IndexedDBCallbacksBase::onBlocked(long long old_version) {
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksIntBlocked(
       thread_id_, response_id_, old_version));
 }
 
 void IndexedDBCallbacksBase::onBlocked() {
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksBlocked(thread_id_,
                                                            response_id_));
 }
 
-template<>
-void IndexedDBCallbacks<WebKit::WebIDBDatabase>::onUpgradeNeeded(
+IndexedDBCallbacksTransaction::IndexedDBCallbacksTransaction(
+      IndexedDBDispatcherHost* dispatcher_host,
+      int32 thread_id,
+      int32 response_id,
+      const GURL& origin_url)
+      : IndexedDBCallbacksBase(dispatcher_host, thread_id, response_id),
+    origin_url_(origin_url) {

[jsbell, 2012/08/29 15:50:07]

Indenting.

[dgrogan, 2012/08/29 18:43:23]

Done.

+}
+
+void IndexedDBCallbacksTransaction::onSuccess(
+    WebKit::WebIDBTransaction* idb_object) {
+  int32 object_id =
+      dispatcher_host()->Add(idb_object, thread_id(), origin_url_);
+  dispatcher_host()->Send(
+      new IndexedDBMsg_CallbacksSuccessIDBTransaction(thread_id(),
+          response_id(), object_id));
+}
+
+IndexedDBCallbacksDatabase::IndexedDBCallbacksDatabase(
+    IndexedDBDispatcherHost* dispatcher_host,
+    int32 thread_id,
+    int32 response_id,
+    const GURL& origin_url)
+    : IndexedDBCallbacksBase(dispatcher_host, thread_id, response_id),
+  origin_url_(origin_url),

[jsbell, 2012/08/29 15:50:07]

Indenting.

[dgrogan, 2012/08/29 18:43:23]

Done.

+  database_id_(kDatabaseNotAdded) {

[jsbell, 2012/08/29 15:50:07]

Ditto.

[dgrogan, 2012/08/29 18:43:23]

Done.

+}
+
+void IndexedDBCallbacksDatabase::onSuccess(
+    WebKit::WebIDBDatabase* idb_object) {
+  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;
+  }
+  dispatcher_host()->Send(
+      new IndexedDBMsg_CallbacksSuccessIDBDatabase(thread_id(), response_id(),
+          object_id));
+}
+
+void IndexedDBCallbacksDatabase::onUpgradeNeeded(
     long long old_version,
     WebKit::WebIDBTransaction* transaction,
     WebKit::WebIDBDatabase* database) {
   int32 transaction_id = dispatcher_host()->Add(transaction, thread_id(),
                                                 origin_url_);
   int32 database_id = dispatcher_host()->Add(database, thread_id(),
                                              origin_url_);
   database_id_ = database_id;
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksUpgradeNeeded(
@@ skipping 101 matching lines @@
 
 void IndexedDBCallbacks<WebKit::WebSerializedScriptValue>::onSuccess(
     const WebKit::WebSerializedScriptValue& value,
     const WebKit::WebIDBKey& primaryKey,
     const WebKit::WebIDBKeyPath& keyPath) {
   dispatcher_host()->Send(
       new IndexedDBMsg_CallbacksSuccessSerializedScriptValueWithKey(
           thread_id(), response_id(), SerializedScriptValue(value),
           IndexedDBKey(primaryKey), IndexedDBKeyPath(keyPath)));
 }