Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(601)

Unified Diff: third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp

Issue 1706413002: Indexed DB: Rename "int version" to "version" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
index 6cfdb3bcd0d06e941c4bb7a1c156c7969ebd290e..788ab7db6365616668374e6f6a3130f95c6d5500 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
@@ -74,7 +74,7 @@ void IDBOpenDBRequest::onBlocked(int64_t oldVersion)
IDB_TRACE("IDBOpenDBRequest::onBlocked()");
if (!shouldEnqueueEvent())
return;
- Nullable<unsigned long long> newVersionNullable = (m_version == IDBDatabaseMetadata::DefaultIntVersion) ? Nullable<unsigned long long>() : Nullable<unsigned long long>(m_version);
+ Nullable<unsigned long long> newVersionNullable = (m_version == IDBDatabaseMetadata::DefaultVersion) ? Nullable<unsigned long long>() : Nullable<unsigned long long>(m_version);
enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::blocked, oldVersion, newVersionNullable));
}
@@ -95,17 +95,17 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBData
IDBDatabase* idbDatabase = IDBDatabase::create(executionContext(), backend, m_databaseCallbacks.release());
idbDatabase->setMetadata(metadata);
- if (oldVersion == IDBDatabaseMetadata::NoIntVersion) {
- // This database hasn't had an integer version before.
- oldVersion = IDBDatabaseMetadata::DefaultIntVersion;
+ if (oldVersion == IDBDatabaseMetadata::NoVersion) {
+ // This database hasn't had a version before.
+ oldVersion = IDBDatabaseMetadata::DefaultVersion;
}
IDBDatabaseMetadata oldMetadata(metadata);
- oldMetadata.intVersion = oldVersion;
+ oldMetadata.version = oldVersion;
m_transaction = IDBTransaction::create(scriptState(), m_transactionId, idbDatabase, this, oldMetadata);
setResult(IDBAny::create(idbDatabase));
- if (m_version == IDBDatabaseMetadata::NoIntVersion)
+ if (m_version == IDBDatabaseMetadata::NoVersion)
m_version = 1;
enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::upgradeneeded, oldVersion, m_version, dataLoss, dataLossMessage));
}
@@ -144,9 +144,9 @@ void IDBOpenDBRequest::onSuccess(int64_t oldVersion)
IDB_TRACE("IDBOpenDBRequest::onSuccess()");
if (!shouldEnqueueEvent())
return;
- if (oldVersion == IDBDatabaseMetadata::NoIntVersion) {
+ if (oldVersion == IDBDatabaseMetadata::NoVersion) {
// This database hasn't had an integer version before.
- oldVersion = IDBDatabaseMetadata::DefaultIntVersion;
+ oldVersion = IDBDatabaseMetadata::DefaultVersion;
}
setResult(IDBAny::createUndefined());
enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::success, oldVersion, Nullable<unsigned long long>()));

Powered by Google App Engine
This is Rietveld 408576698