Indexed DB: Rename "int version" to "version"

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 56 matching lines @@
 const AtomicString& IDBOpenDBRequest::interfaceName() const
 {
     return EventTargetNames::IDBOpenDBRequest;
 }
 
 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));
 }
 
 void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, WebIDBDataLoss dataLoss, String dataLossMessage)
 {
     IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()");
     if (m_contextStopped || !executionContext()) {
         OwnPtr<WebIDBDatabase> db = backend;
         db->abort(m_transactionId);
         db->close();
         return;
     }
     if (!shouldEnqueueEvent())
         return;
 
     ASSERT(m_databaseCallbacks);
 
     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));
 }
 
 void IDBOpenDBRequest::onSuccess(PassOwnPtr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata)
 {
     IDB_TRACE("IDBOpenDBRequest::onSuccess()");
     if (m_contextStopped || !executionContext()) {
         OwnPtr<WebIDBDatabase> db = backend;
         if (db)
@@ skipping 18 matching lines @@
     }
     idbDatabase->setMetadata(metadata);
     enqueueEvent(Event::create(EventTypeNames::success));
 }
 
 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>()));
 }
 
 bool IDBOpenDBRequest::shouldEnqueueEvent() const
 {
     if (m_contextStopped || !executionContext())
         return false;
     ASSERT(m_readyState == PENDING || m_readyState == DONE);
@@ skipping 10 matching lines @@
         dequeueEvent(event.get());
         setResult(nullptr);
         onError(DOMException::create(AbortError, "The connection was closed."));
         return false;
     }
 
     return IDBRequest::dispatchEventInternal(event);
 }
 
 } // namespace blink