Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1680275 - LSNG: Change gDatastores to use NotNull; r=dom-workers-and-storage-reviewers,sg

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D99198
This commit is contained in:
Jan Varga 2021-01-28 21:24:40 +00:00
parent f467ea41bc
commit ccef31f31a
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dom/localstorage/ActorsParent.cpp
View File

@ -2696,8 +2696,9 @@ class nsCStringHashKeyDM : public nsCStringHashKey {
typedef std::conditional<DiagnosticAssertEnabled::value, nsCStringHashKeyDM,
nsCStringHashKey>::type DatastoreHashKey;
typedef nsDataHashtable<DatastoreHashKey, CheckedUnsafePtr<Datastore>>
DatastoreHashtable;
using DatastoreHashtable =
nsBaseHashtable<DatastoreHashKey, NotNull<CheckedUnsafePtr<Datastore>>,
MovingNotNull<CheckedUnsafePtr<Datastore>>>;
StaticAutoPtr<DatastoreHashtable> gDatastores;
@ -2775,11 +2776,9 @@ already_AddRefed<Datastore> GetDatastore(const nsACString& aOrigin) {
AssertIsOnBackgroundThread();
if (gDatastores) {
CheckedUnsafePtr<Datastore> datastore;
if (gDatastores->Get(aOrigin, &datastore)) {
MOZ_ASSERT(datastore);
RefPtr<Datastore> result(datastore);
auto maybeDatastore = gDatastores->MaybeGet(aOrigin);
if (maybeDatastore) {
RefPtr<Datastore> result(std::move(*maybeDatastore).unwrapBasePtr());
return result.forget();
}
}
@ -3396,8 +3395,6 @@ bool RecvLSClearPrivateBrowsing() {
if (gDatastores) {
for (const auto& entry : *gDatastores) {
const auto& datastore = entry.GetData();
MOZ_ASSERT(datastore);
if (datastore->PrivateBrowsingId()) {
datastore->Clear(nullptr);
}
@ -5071,8 +5068,8 @@ void Datastore::CleanupMetadata() {
AssertIsOnBackgroundThread();
MOZ_ASSERT(gDatastores);
MOZ_ASSERT(gDatastores->Get(mGroupAndOrigin.mOrigin));
gDatastores->Remove(mGroupAndOrigin.mOrigin);
const DebugOnly<bool> removed = gDatastores->Remove(mGroupAndOrigin.mOrigin);
MOZ_ASSERT(removed);
QuotaManager::GetRef().MaybeRecordShutdownStep(quota::Client::LS,
"Datastore removed"_ns);
@ -7236,8 +7233,8 @@ void PrepareDatastoreOp::GetResponse(LSRequestResponse& aResponse) {
gDatastores = new DatastoreHashtable();
}
MOZ_ASSERT(!gDatastores->Get(Origin()));
gDatastores->Put(Origin(), mDatastore);
MOZ_ASSERT(!gDatastores->MaybeGet(Origin()));
gDatastores->Put(Origin(), WrapMovingNotNullUnchecked(mDatastore));
}
if (mPrivateBrowsingId && !mInvalidated) {
@ -8520,8 +8517,6 @@ nsCString QuotaClient::GetShutdownStatus() const {
nsTHashtable<nsCStringHashKey> ids;
for (const auto& entry : *gDatastores) {
MOZ_ASSERT(entry.GetData());
nsCString id;
entry.GetData()->Stringify(id);