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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/indexed_db/indexed_db_database.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: Created 4 years, 9 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
« content/browser/indexed_db/indexed_db_database.h ('K') | « content/browser/indexed_db/indexed_db_database.h ('k') | content/browser/indexed_db/indexed_db_dispatcher_host.h » ('j') | content/browser/indexed_db/indexed_db_factory_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/indexed_db/indexed_db_database.cc
diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc
index a877a7bac288e7fc97918d0ce34647d74a589f69..66de2dd2428ecb4aaed16bdc03cf075fa8483a35 100644
--- a/content/browser/indexed_db/indexed_db_database.cc
+++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -36,6 +36,7 @@
#include "storage/browser/blob/blob_data_handle.h"
#include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h"
#include "third_party/leveldatabase/env_chromium.h"
+#include "url/origin.h"
using base::ASCIIToUTF16;
using base::Int64ToString16;
@@ -344,8 +345,7 @@ void IndexedDBDatabase::CreateObjectStore(int64_t transaction_id,
object_store_metadata.name + ASCIIToUTF16("'."));
transaction->Abort(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
@@ -475,8 +475,7 @@ void IndexedDBDatabase::DeleteIndexOperation(
error_string);
transaction->Abort(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
@@ -634,8 +633,7 @@ void IndexedDBDatabase::GetOperation(
IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
"Internal error deleting data in range");
if (s.IsCorruption()) {
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
}
}
@@ -662,8 +660,7 @@ void IndexedDBDatabase::GetOperation(
callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
@@ -695,8 +692,7 @@ void IndexedDBDatabase::GetOperation(
"Internal error in GetPrimaryKeyViaIndex.");
callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
if (!primary_key) {
@@ -721,8 +717,7 @@ void IndexedDBDatabase::GetOperation(
"Internal error in GetRecord.");
callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
@@ -793,8 +788,7 @@ void IndexedDBDatabase::GetAllOperation(
"Internal error in GetAllOperation");
callbacks->OnError(error);
if (s.IsCorruption()) {
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
}
return;
}
@@ -827,8 +821,7 @@ void IndexedDBDatabase::GetAllOperation(
"Internal error in GetAllOperation.");
callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
@@ -1001,8 +994,7 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,
"Internal error checking key existence.");
params->callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
if (found) {
@@ -1054,8 +1046,7 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,
"Internal error: backing store error performing put/add.");
params->callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
{
@@ -1085,8 +1076,7 @@ void IndexedDBDatabase::PutOperation(scoped_ptr<PutOperationParams> params,
"Internal error updating key generator.");
params->callbacks->OnError(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
}
@@ -1123,8 +1113,7 @@ void IndexedDBDatabase::SetIndexKeys(int64_t transaction_id,
"Internal error setting index keys.");
transaction->Abort(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
if (!found) {
@@ -1301,8 +1290,7 @@ void IndexedDBDatabase::OpenCursorOperation(
IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
"Internal error opening cursor operation");
if (s.IsCorruption()) {
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
}
}
@@ -1374,8 +1362,7 @@ void IndexedDBDatabase::CountOperation(
IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
"Internal error performing count operation");
if (s.IsCorruption()) {
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
}
}
if (!backing_store_cursor) {
@@ -1432,8 +1419,7 @@ void IndexedDBDatabase::DeleteRangeOperation(
error_string);
transaction->Abort(error);
if (s.IsCorruption()) {
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
}
return;
}
@@ -1468,8 +1454,7 @@ void IndexedDBDatabase::ClearOperation(
"Internal error clearing object store");
callbacks->OnError(error);
if (s.IsCorruption()) {
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
}
return;
}
@@ -1497,8 +1482,7 @@ void IndexedDBDatabase::DeleteObjectStoreOperation(
error_string);
transaction->Abort(error);
if (s.IsCorruption())
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(),
- error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
return;
}
@@ -1577,9 +1561,9 @@ void IndexedDBDatabase::TransactionCommitFailed(const leveldb::Status& status) {
if (status.IsCorruption()) {
IndexedDBDatabaseError error(blink::WebIDBDatabaseExceptionUnknownError,
"Error committing transaction");
- factory_->HandleBackingStoreCorruption(backing_store_->origin_url(), error);
+ factory_->HandleBackingStoreCorruption(backing_store_->origin(), error);
} else {
- factory_->HandleBackingStoreFailure(backing_store_->origin_url());
+ factory_->HandleBackingStoreFailure(backing_store_->origin());
}
}
@@ -1856,9 +1840,9 @@ void IndexedDBDatabase::DeleteDatabaseFinal(
"Internal error deleting database.");
callbacks->OnError(error);
if (s.IsCorruption()) {
- GURL origin_url = backing_store_->origin_url();
+ url::Origin origin = backing_store_->origin();
backing_store_ = NULL;
- factory_->HandleBackingStoreCorruption(origin_url, error);
+ factory_->HandleBackingStoreCorruption(origin, error);
}
return;
}
@@ -1929,7 +1913,8 @@ void IndexedDBDatabase::Close(IndexedDBConnection* connection, bool forced) {
!pending_delete_calls_.size()) {
DCHECK(transactions_.empty());
- const GURL origin_url = backing_store_->origin_url();
+ // TODO(jsbell): Why is this used here?
cmumford 2016/03/31 20:54:16 My guess is a cut-and-paste error from line 1843.
jsbell 2016/04/01 20:31:35 Removed.
+ const url::Origin origin = backing_store_->origin();
backing_store_ = NULL;
factory_->ReleaseDatabase(identifier_, forced);
« content/browser/indexed_db/indexed_db_database.h ('K') | « content/browser/indexed_db/indexed_db_database.h ('k') | content/browser/indexed_db/indexed_db_dispatcher_host.h » ('j') | content/browser/indexed_db/indexed_db_factory_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698