| Index: Source/modules/indexeddb/IDBOpenDBRequest.cpp
|
| diff --git a/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/Source/modules/indexeddb/IDBOpenDBRequest.cpp
|
| index 9199f717a3d114ba0583a0c1f82f20c84defef3b..123a5ff30113a83b292e9172c2dcaec3cbe51861 100644
|
| --- a/Source/modules/indexeddb/IDBOpenDBRequest.cpp
|
| +++ b/Source/modules/indexeddb/IDBOpenDBRequest.cpp
|
| @@ -26,6 +26,7 @@
|
| #include "config.h"
|
| #include "modules/indexeddb/IDBOpenDBRequest.h"
|
|
|
| +#include "bindings/v8/Nullable.h"
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/dom/ExecutionContext.h"
|
| #include "modules/indexeddb/IDBDatabase.h"
|
| @@ -69,8 +70,8 @@ void IDBOpenDBRequest::onBlocked(int64_t oldVersion)
|
| IDB_TRACE("IDBOpenDBRequest::onBlocked()");
|
| if (!shouldEnqueueEvent())
|
| return;
|
| - RefPtr<IDBAny> newVersionAny = (m_version == IDBDatabaseMetadata::DefaultIntVersion) ? IDBAny::createNull() : IDBAny::create(m_version);
|
| - enqueueEvent(IDBVersionChangeEvent::create(IDBAny::create(oldVersion), newVersionAny.release(), EventTypeNames::blocked));
|
| + Nullable<unsigned long long> newVersionNullable = (m_version == IDBDatabaseMetadata::DefaultIntVersion) ? Nullable<unsigned long long>() : Nullable<unsigned long long>(m_version);
|
| + enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::blocked, oldVersion, newVersionNullable));
|
| }
|
|
|
| void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, blink::WebIDBDataLoss dataLoss, String dataLossMessage)
|
| @@ -102,7 +103,7 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBData
|
|
|
| if (m_version == IDBDatabaseMetadata::NoIntVersion)
|
| m_version = 1;
|
| - enqueueEvent(IDBVersionChangeEvent::create(IDBAny::create(oldVersion), IDBAny::create(m_version), EventTypeNames::upgradeneeded, dataLoss, dataLossMessage));
|
| + enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::upgradeneeded, oldVersion, m_version, dataLoss, dataLossMessage));
|
| }
|
|
|
| void IDBOpenDBRequest::onSuccess(PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata)
|
|
|