[IndexedDB] Adding transaction and value support to observers

third_party/WebKit/Source/modules/indexeddb/IDBObserver.cpp

 // Copyright 2016 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 "modules/indexeddb/IDBObserver.h"
 
 #include <bitset>
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/modules/v8/IDBObserverCallback.h"
@@ skipping 22 matching lines @@
   if (transaction->isFinished() || transaction->isFinishing()) {
     exceptionState.throwDOMException(
         TransactionInactiveError, IDBDatabase::transactionFinishedErrorMessage);
     return;
   }
   if (!transaction->isActive()) {
     exceptionState.throwDOMException(
         TransactionInactiveError, IDBDatabase::transactionInactiveErrorMessage);
     return;
   }
+  if (transaction->isVersionChange()) {
+    exceptionState.throwDOMException(
+        TransactionInactiveError,
+        IDBDatabase::cannotObserveVersionChangeTransaction);
+    return;
+  }
   if (!database->backend()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      IDBDatabase::databaseClosedErrorMessage);
     return;
   }
   if (!options.hasOperationTypes()) {
     exceptionState.throwTypeError(
         "operationTypes not specified in observe options.");
     return;
   }
@@ skipping 14 matching lines @@
       types[WebIDBClear] = true;
     } else {
       exceptionState.throwTypeError(
           "Unknown operation type in observe options: " + operationType);
       return;
     }
   }
 
   int32_t observerId =
       database->addObserver(this, transaction->id(), options.transaction(),
-                            options.values(), options.noRecords(), types);
+                            options.noRecords(), options.values(), types);
   m_observerIds.add(observerId, database);
 }
 
 void IDBObserver::unobserve(IDBDatabase* database,
                             ExceptionState& exceptionState) {
   if (!database->backend()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      IDBDatabase::databaseClosedErrorMessage);
     return;
   }
 
   Vector<int32_t> observerIdsToRemove;
   for (const auto& it : m_observerIds) {
     if (it.value == database)
       observerIdsToRemove.append(it.key);
   }
   m_observerIds.removeAll(observerIdsToRemove);
 
   if (!observerIdsToRemove.isEmpty())
     database->removeObservers(observerIdsToRemove);
 }
 
 DEFINE_TRACE(IDBObserver) {
   visitor->trace(m_callback);
   visitor->trace(m_observerIds);
 }
 
 }  // namespace blink