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

Unified Diff: content/browser/indexed_db/indexed_db_callbacks.cc

Issue 1841553002: IndexedDB: Use url::Origin rather than GURL for representing origins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@origin-idb
Patch Set: Rebased Created 4 years, 8 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: content/browser/indexed_db/indexed_db_callbacks.cc
diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc
index 092bb30cd3d8a5ca0ceaa46aca50eaf8ba8d39d0..6c541b7d5d88d0ba2a54d5441037ef561c101f3e 100644
--- a/content/browser/indexed_db/indexed_db_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_callbacks.cc
@@ -71,13 +71,13 @@ IndexedDBCallbacks::IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
int32_t ipc_callbacks_id,
int32_t ipc_database_callbacks_id,
int64_t host_transaction_id,
- const GURL& origin_url)
+ const url::Origin& origin)
: dispatcher_host_(dispatcher_host),
ipc_callbacks_id_(ipc_callbacks_id),
ipc_thread_id_(ipc_thread_id),
ipc_cursor_id_(kNoCursor),
host_transaction_id_(host_transaction_id),
- origin_url_(origin_url),
+ origin_(origin),
ipc_database_id_(kNoDatabase),
ipc_database_callbacks_id_(ipc_database_callbacks_id),
data_loss_(blink::WebIDBDataLossNone),
@@ -160,9 +160,9 @@ void IndexedDBCallbacks::OnUpgradeNeeded(
DCHECK_EQ(kNoDatabase, ipc_database_id_);
DCHECK_NE(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
- dispatcher_host_->RegisterTransactionId(host_transaction_id_, origin_url_);
+ dispatcher_host_->RegisterTransactionId(host_transaction_id_, origin_);
int32_t ipc_database_id =
- dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_url_);
+ dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_);
if (ipc_database_id < 0)
return;
ipc_database_id_ = ipc_database_id;
@@ -200,8 +200,8 @@ void IndexedDBCallbacks::OnSuccess(
int32_t ipc_object_id = kNoDatabase;
// Only register if the connection was not previously sent in OnUpgradeNeeded.
if (ipc_database_id_ == kNoDatabase) {
- ipc_object_id = dispatcher_host_->Add(
- connection.release(), ipc_thread_id_, origin_url_);
+ ipc_object_id =
+ dispatcher_host_->Add(connection.release(), ipc_thread_id_, origin_);
}
dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessIDBDatabase(

Powered by Google App Engine
This is Rietveld 408576698