diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index ad5ce6495c22..8fa205b2d09d 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -1647,13 +1647,6 @@ FontFaceSet* nsGlobalWindowInner::Fonts() { return nullptr; } -uint32_t nsGlobalWindowInner::GetPrincipalHashValue() const { - if (mDoc) { - return mDoc->NodePrincipal()->GetHashValue(); - } - return 0; -} - mozilla::Result nsGlobalWindowInner::GetStorageKey() { MOZ_ASSERT(NS_IsMainThread()); diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h index 802a98f81b66..68bc78c14dd4 100644 --- a/dom/base/nsGlobalWindowInner.h +++ b/dom/base/nsGlobalWindowInner.h @@ -248,7 +248,6 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget, // nsIGlobalObject bool ShouldResistFingerprinting() const final; - uint32_t GetPrincipalHashValue() const final; mozilla::OriginTrials Trials() const final; mozilla::dom::FontFaceSet* Fonts() final; diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp index e330712345c2..91c280687416 100644 --- a/dom/base/nsGlobalWindowOuter.cpp +++ b/dom/base/nsGlobalWindowOuter.cpp @@ -1672,13 +1672,6 @@ bool nsGlobalWindowOuter::ShouldResistFingerprinting() const { "to make an informed RFP choice, so we fall back to the global pref"); } -uint32_t nsGlobalWindowOuter::GetPrincipalHashValue() const { - if (mDoc) { - return mDoc->NodePrincipal()->GetHashValue(); - } - return 0; -} - OriginTrials nsGlobalWindowOuter::Trials() const { return mInnerWindow ? nsGlobalWindowInner::Cast(mInnerWindow)->Trials() : OriginTrials(); diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h index b7ebe5b2c04c..2ddd6442cdf9 100644 --- a/dom/base/nsGlobalWindowOuter.h +++ b/dom/base/nsGlobalWindowOuter.h @@ -234,7 +234,6 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget, // nsIGlobalObject bool ShouldResistFingerprinting() const final; - uint32_t GetPrincipalHashValue() const final; mozilla::OriginTrials Trials() const final; mozilla::dom::FontFaceSet* Fonts() final; diff --git a/dom/base/nsIGlobalObject.cpp b/dom/base/nsIGlobalObject.cpp index 30db37fb67ef..e59695b273f4 100644 --- a/dom/base/nsIGlobalObject.cpp +++ b/dom/base/nsIGlobalObject.cpp @@ -394,12 +394,8 @@ mozilla::Result nsIGlobalObject::HasEqualStorageKey( return mozilla::ipc::StorageKeysEqual(storageKey, aStorageKey); } -bool nsIGlobalObject::IsSystemPrincipal() const { - return PrincipalOrNull()->IsSystemPrincipal(); -} - RTPCallerType nsIGlobalObject::GetRTPCallerType() const { - if (IsSystemPrincipal()) { + if (PrincipalOrNull()->IsSystemPrincipal()) { return RTPCallerType::SystemPrincipal; } diff --git a/dom/base/nsIGlobalObject.h b/dom/base/nsIGlobalObject.h index 81d350b35bcd..012dae9662ca 100644 --- a/dom/base/nsIGlobalObject.h +++ b/dom/base/nsIGlobalObject.h @@ -258,12 +258,6 @@ class nsIGlobalObject : public nsISupports, RTPCallerType GetRTPCallerType() const; - /** - * Threadsafe way to get nsIPrincipal::GetHashValue for the associated - * principal. - */ - virtual uint32_t GetPrincipalHashValue() const { return 0; } - /** * Get the module loader to use for this global, if any. By default this * returns null. @@ -284,8 +278,6 @@ class nsIGlobalObject : public nsISupports, protected: virtual ~nsIGlobalObject(); - virtual bool IsSystemPrincipal() const; - void StartDying() { mIsDying = true; } void StartForbiddingScript() { mIsScriptForbidden = true; } diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp index 9fc7162746f9..1e0cbdf0a47a 100644 --- a/dom/canvas/ClientWebGLContext.cpp +++ b/dom/canvas/ClientWebGLContext.cpp @@ -5678,7 +5678,10 @@ uint32_t ClientWebGLContext::GetPrincipalHashValue() const { if (mOffscreenCanvas) { nsIGlobalObject* global = mOffscreenCanvas->GetOwnerGlobal(); if (global) { - return global->GetPrincipalHashValue(); + nsIPrincipal* principal = global->PrincipalOrNull(); + if (principal) { + return principal->GetHashValue(); + } } } return 0; diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h index 1e22ecc738c4..1474b43170af 100644 --- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h @@ -772,10 +772,6 @@ class WorkerPrivate final return *mLoadInfo.mPartitionedPrincipalInfo; } - uint32_t GetPrincipalHashValue() const { - return GetPrincipal()->GetHashValue(); - } - const mozilla::ipc::PrincipalInfo& GetEffectiveStoragePrincipalInfo() const; already_AddRefed ForgetWorkerChannel() { diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp index 5b0caf86128a..51b01283987d 100644 --- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -275,15 +275,6 @@ bool WorkerGlobalScopeBase::ShouldResistFingerprinting() const { return mShouldResistFingerprinting; } -bool WorkerGlobalScopeBase::IsSystemPrincipal() const { - return mWorkerPrivate->UsesSystemPrincipal(); -} - -uint32_t WorkerGlobalScopeBase::GetPrincipalHashValue() const { - AssertIsOnWorkerThread(); - return mWorkerPrivate->GetPrincipalHashValue(); -} - OriginTrials WorkerGlobalScopeBase::Trials() const { AssertIsOnWorkerThread(); return mWorkerPrivate->Trials(); diff --git a/dom/workers/WorkerScope.h b/dom/workers/WorkerScope.h index 84f81282cced..5dc2cbfc9ddc 100644 --- a/dom/workers/WorkerScope.h +++ b/dom/workers/WorkerScope.h @@ -120,8 +120,6 @@ class WorkerGlobalScopeBase : public DOMEventTargetHelper, bool ShouldResistFingerprinting() const final; - uint32_t GetPrincipalHashValue() const final; - OriginTrials Trials() const final; StorageAccess GetStorageAccess() final; @@ -174,8 +172,6 @@ class WorkerGlobalScopeBase : public DOMEventTargetHelper, protected: ~WorkerGlobalScopeBase(); - bool IsSystemPrincipal() const final; - CheckedUnsafePtr mWorkerPrivate; void AssertIsOnWorkerThread() const { diff --git a/dom/worklet/WorkletGlobalScope.cpp b/dom/worklet/WorkletGlobalScope.cpp index 484e5d70735e..417dfea88ea9 100644 --- a/dom/worklet/WorkletGlobalScope.cpp +++ b/dom/worklet/WorkletGlobalScope.cpp @@ -76,10 +76,6 @@ bool WorkletGlobalScope::ShouldResistFingerprinting() const { return mImpl->ShouldResistFingerprinting(); } -bool WorkletGlobalScope::IsSystemPrincipal() const { - return mImpl->IsSystemPrincipal(); -} - void WorkletGlobalScope::Dump(const Optional& aString) const { WorkletThread::AssertIsOnWorkletThread(); diff --git a/dom/worklet/WorkletGlobalScope.h b/dom/worklet/WorkletGlobalScope.h index 3d34e2c81370..06d64f6a31da 100644 --- a/dom/worklet/WorkletGlobalScope.h +++ b/dom/worklet/WorkletGlobalScope.h @@ -73,8 +73,6 @@ class WorkletGlobalScope : public nsIGlobalObject, public nsWrapperCache { protected: ~WorkletGlobalScope(); - bool IsSystemPrincipal() const override; - const RefPtr mImpl; private: