Commit 989747c7 authored by Jan Varga's avatar Jan Varga
Browse files

Bug 1781201 - Convert GetInfoFromValidatedPrincipalInfo to a non-static method; r=hsingh 

The method will need to access members of the QuotaManager class, so it can't
be static anymore.

Differential Revision: https://phabricator.services.mozilla.com/D176872
parent 573fdf07

dom/cache/Context.cpp

+9 −9
Original line number Diff line number Diff line
@@ -357,18 +357,18 @@ Context::QuotaInitRunnable::Run() { 
        break;

      }



      mDirectoryMetadata.emplace(

          QuotaManager::GetInfoFromValidatedPrincipalInfo(*mPrincipalInfo));



      QM_TRY(QuotaManager::EnsureCreated(), QM_PROPAGATE,

             [&resolver](const auto rv) { resolver->Resolve(rv); });



      MOZ_DIAGNOSTIC_ASSERT(QuotaManager::Get());

      auto* const quotaManager = QuotaManager::Get();

      MOZ_DIAGNOSTIC_ASSERT(quotaManager);



      mDirectoryMetadata.emplace(

          quotaManager->GetInfoFromValidatedPrincipalInfo(*mPrincipalInfo));



      // Open directory

      RefPtr<DirectoryLock> directoryLock =

          QuotaManager::Get()->CreateDirectoryLock(PERSISTENCE_TYPE_DEFAULT,

                                                   *mDirectoryMetadata,

      RefPtr<DirectoryLock> directoryLock = quotaManager->CreateDirectoryLock(

          PERSISTENCE_TYPE_DEFAULT, *mDirectoryMetadata,

          quota::Client::DOMCACHE,

          /* aExclusive */ false);

dom/fs/parent/FileSystemManagerParentFactory.cpp

+7 −1
Original line number Diff line number Diff line
@@ -38,8 +38,14 @@ mozilla::ipc::IPCResult CreateFileSystemManagerParent( 
         IPC_OK(),

         [aResolver](const auto&) { aResolver(NS_ERROR_DOM_SECURITY_ERR); });



  QM_TRY(quota::QuotaManager::EnsureCreated(), IPC_OK(),

         [aResolver](const auto&) { aResolver(NS_ERROR_FAILURE); });



  auto* const quotaManager = quota::QuotaManager::Get();

  MOZ_ASSERT(quotaManager);



  quota::OriginMetadata originMetadata(

      quota::QuotaManager::GetInfoFromValidatedPrincipalInfo(aPrincipalInfo),

      quotaManager->GetInfoFromValidatedPrincipalInfo(aPrincipalInfo),

      quota::PERSISTENCE_TYPE_DEFAULT);



  // Block use for now in PrivateBrowsing

dom/fs/parent/datamodel/FileSystemDataManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -214,9 +214,8 @@ FileSystemDataManager::GetOrCreateFileSystemDataManager( 
        Registered<FileSystemDataManager>(std::move(dataManager)), __func__);

  }



  QM_TRY_UNWRAP(RefPtr<quota::QuotaManager> quotaManager,

                quota::QuotaManager::GetOrCreate(),

                CreatePromise::CreateAndReject(NS_ERROR_FAILURE, __func__));

  RefPtr<quota::QuotaManager> quotaManager = quota::QuotaManager::Get();

  MOZ_ASSERT(quotaManager);



  QM_TRY_UNWRAP(auto streamTransportService,

                MOZ_TO_RESULT_GET_TYPED(nsCOMPtr<nsIEventTarget>,

dom/indexedDB/ActorsParent.cpp

+6 −6
Original line number Diff line number Diff line
@@ -14922,6 +14922,11 @@ nsresult FactoryOp::FinishOpen() { 
    return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;

  }









  QM_TRY(QuotaManager::EnsureCreated());

















  QuotaManager* const quotaManager = QuotaManager::Get();









  MOZ_ASSERT(quotaManager);

















  const PrincipalInfo& principalInfo = mCommonParams.principalInfo();

















  const DatabaseMetadata& metadata = mCommonParams.metadata();








@@ -14938,7 +14943,7 @@ nsresult FactoryOp::FinishOpen() {







    MOZ_ASSERT(principalInfo.type() == PrincipalInfo::TContentPrincipalInfo);

















    mOriginMetadata = {









        QuotaManager::GetInfoFromValidatedPrincipalInfo(principalInfo),









        quotaManager->GetInfoFromValidatedPrincipalInfo(principalInfo),









        persistenceType};

















    mEnforcingQuota = persistenceType != PERSISTENCE_TYPE_PERSISTENT;








@@ -14950,11 +14955,6 @@ nsresult FactoryOp::FinishOpen() {







  mDatabaseId.Append('*');









  mDatabaseId.Append(NS_ConvertUTF16toUTF8(metadata.name()));

















  QM_TRY(QuotaManager::EnsureCreated());

















  QuotaManager* const quotaManager = QuotaManager::Get();









  MOZ_ASSERT(quotaManager);

















  // Need to get database file path before opening the directory.









  // XXX: For what reason?









  QM_TRY_UNWRAP(
































dom/localstorage/ActorsParent.cpp



+7
−3






























Original line number
Diff line number
Diff line







@@ -6654,6 +6654,8 @@ nsresult PrepareDatastoreOp::Start() {







  MOZ_ASSERT(!QuotaClient::IsShuttingDownOnBackgroundThread());









  MOZ_ASSERT(MayProceed());



















  QM_TRY(QuotaManager::EnsureCreated());



















  const LSRequestCommonParams& commonParams =









      mForPreload









          ? mParams.get_LSRequestPreloadDatastoreParams().commonParams()








@@ -6670,7 +6672,8 @@ nsresult PrepareDatastoreOp::Start() {







               PrincipalInfo::TContentPrincipalInfo);



















    PrincipalMetadata principalMetadata =









        QuotaManager::GetInfoFromValidatedPrincipalInfo(storagePrincipalInfo);









        QuotaManager::Get()->GetInfoFromValidatedPrincipalInfo(









            storagePrincipalInfo);



















    mOriginMetadata.mSuffix = std::move(principalMetadata.mSuffix);









    mOriginMetadata.mGroup = std::move(principalMetadata.mGroup);








@@ -6840,10 +6843,11 @@ nsresult PrepareDatastoreOp::BeginDatastorePreparationInternal() {







    return NS_OK;









  }



















  QM_TRY(QuotaManager::EnsureCreated());









  QuotaManager* quotaManager = QuotaManager::Get();









  MOZ_ASSERT(quotaManager);



















  // Open directory









  mPendingDirectoryLock = QuotaManager::Get()->CreateDirectoryLock(









  mPendingDirectoryLock = quotaManager->CreateDirectoryLock(









      PERSISTENCE_TYPE_DEFAULT, mOriginMetadata,









      mozilla::dom::quota::Client::LS,









      /* aExclusive */ false);