Commit 494680fb authored by Darwin Huang's avatar Darwin Huang Committed by Commit Bot

Refactor: unsigned long long -> uint64_t in third_party/blink/renderer/modules/indexeddb

- First CL to attempt to remove all uses of unsigned long long in blink.
- unsigned long long -> uint64_t.
- No logic changes (99% certain).

Bug: 929980
Change-Id: Ic655639bf98f18e187da34534d758cc432cf0b6f
Reviewed-on: https://chromium-review.googlesource.com/c/1461823Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630632}
parent c3cc03af
......@@ -479,7 +479,7 @@ void IDBDatabase::OnVersionChange(int64_t old_version, int64_t new_version) {
return;
}
base::Optional<unsigned long long> new_version_nullable;
base::Optional<uint64_t> new_version_nullable;
if (new_version != IDBDatabaseMetadata::kNoVersion) {
new_version_nullable = new_version;
}
......
......@@ -97,7 +97,7 @@ class MODULES_EXPORT IDBDatabase final
// Implement the IDL
const String& name() const { return metadata_.name; }
unsigned long long version() const { return metadata_.version; }
uint64_t version() const { return metadata_.version; }
DOMStringList* objectStoreNames() const;
IDBObjectStore* createObjectStore(const String& name,
......
......@@ -290,7 +290,7 @@ IDBRequest* IDBFactory::GetDatabaseNames(ScriptState* script_state,
IDBOpenDBRequest* IDBFactory::open(ScriptState* script_state,
const String& name,
unsigned long long version,
uint64_t version,
ExceptionState& exception_state) {
if (!version) {
exception_state.ThrowTypeError("The version provided must not be 0.");
......
......@@ -59,7 +59,7 @@ class MODULES_EXPORT IDBFactory final : public ScriptWrappable {
IDBOpenDBRequest* open(ScriptState*, const String& name, ExceptionState&);
IDBOpenDBRequest* open(ScriptState*,
const String& name,
unsigned long long version,
uint64_t version,
ExceptionState&);
IDBOpenDBRequest* deleteDatabase(ScriptState*,
const String& name,
......
......@@ -84,7 +84,7 @@ void IDBOpenDBRequest::EnqueueBlocked(int64_t old_version) {
IDB_TRACE("IDBOpenDBRequest::onBlocked()");
if (!ShouldEnqueueEvent())
return;
base::Optional<unsigned long long> new_version_nullable;
base::Optional<uint64_t> new_version_nullable;
if (version_ != IDBDatabaseMetadata::kDefaultVersion) {
new_version_nullable = version_;
}
......
......@@ -34,8 +34,8 @@ IDBVersionChangeEvent::IDBVersionChangeEvent()
IDBVersionChangeEvent::IDBVersionChangeEvent(
const AtomicString& event_type,
unsigned long long old_version,
const base::Optional<unsigned long long>& new_version,
uint64_t old_version,
const base::Optional<uint64_t>& new_version,
mojom::IDBDataLoss data_loss,
const String& data_loss_message)
: Event(event_type, Bubbles::kNo, Cancelable::kNo),
......@@ -56,7 +56,7 @@ IDBVersionChangeEvent::IDBVersionChangeEvent(
data_loss_ = mojom::IDBDataLoss::Total;
}
unsigned long long IDBVersionChangeEvent::newVersion(bool& is_null) const {
uint64_t IDBVersionChangeEvent::newVersion(bool& is_null) const {
is_null = !new_version_.has_value();
return new_version_.value_or(0);
}
......
......@@ -47,8 +47,8 @@ class IDBVersionChangeEvent final : public Event {
}
static IDBVersionChangeEvent* Create(
const AtomicString& event_type,
unsigned long long old_version,
const base::Optional<unsigned long long>& new_version,
uint64_t old_version,
const base::Optional<uint64_t>& new_version,
mojom::IDBDataLoss data_loss = mojom::IDBDataLoss::None,
const String& data_loss_message = String()) {
return MakeGarbageCollected<IDBVersionChangeEvent>(
......@@ -62,15 +62,15 @@ class IDBVersionChangeEvent final : public Event {
IDBVersionChangeEvent();
IDBVersionChangeEvent(const AtomicString& event_type,
unsigned long long old_version,
const base::Optional<unsigned long long>& new_version,
uint64_t old_version,
const base::Optional<uint64_t>& new_version,
mojom::IDBDataLoss,
const String& data_loss);
IDBVersionChangeEvent(const AtomicString& event_type,
const IDBVersionChangeEventInit*);
unsigned long long oldVersion() const { return old_version_; }
unsigned long long newVersion(bool& is_null) const;
uint64_t oldVersion() const { return old_version_; }
uint64_t newVersion(bool& is_null) const;
const AtomicString& dataLoss() const;
const String& dataLossMessage() const { return data_loss_message_; }
......@@ -80,8 +80,8 @@ class IDBVersionChangeEvent final : public Event {
void Trace(blink::Visitor*) override;
private:
unsigned long long old_version_;
base::Optional<unsigned long long> new_version_;
uint64_t old_version_;
base::Optional<uint64_t> new_version_;
mojom::IDBDataLoss data_loss_;
String data_loss_message_;
};
......
......@@ -442,8 +442,7 @@ class DatabaseLoader final
std::unique_ptr<DatabaseWithObjectStores> result =
DatabaseWithObjectStores::create()
.setName(idb_database->name())
.setVersion(
static_cast<unsigned long long>(idb_database->version()))
.setVersion(static_cast<uint64_t>(idb_database->version()))
.setObjectStores(std::move(object_stores))
.build();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment