nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1578623 remove OriginAttributes duplication by reading from PrincipalInfo r=baku

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D44918

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Karl Tomlinson 2019-09-08 23:44:05 +00:00
parent 8b101b80b5
commit 2a772f968e
2 changed files with 2 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
dom/worklet/WorkletImpl.cpp
View file

@ -35,8 +35,7 @@ WorkletLoadInfo::WorkletLoadInfo(nsPIDOMWindowInner* aWindow)
// WorkletImpl // WorkletImpl
WorkletImpl::WorkletImpl(nsPIDOMWindowInner* aWindow, nsIPrincipal* aPrincipal) WorkletImpl::WorkletImpl(nsPIDOMWindowInner* aWindow, nsIPrincipal* aPrincipal)
: mOriginAttributes(BasePrincipal::Cast(aPrincipal)->OriginAttributesRef()), : mPrincipal(NullPrincipal::CreateWithInheritedAttributes(aPrincipal)),
mPrincipal(NullPrincipal::CreateWithInheritedAttributes(aPrincipal)),
mWorkletLoadInfo(aWindow), mWorkletLoadInfo(aWindow),
mTerminated(false) { mTerminated(false) {
Unused << NS_WARN_IF( Unused << NS_WARN_IF(

3
dom/worklet/WorkletImpl.h
View file

@ -70,7 +70,7 @@ class WorkletImpl {
const WorkletLoadInfo& LoadInfo() const { return mWorkletLoadInfo; } const WorkletLoadInfo& LoadInfo() const { return mWorkletLoadInfo; }
const OriginAttributes& OriginAttributesRef() const { const OriginAttributes& OriginAttributesRef() const {
return mOriginAttributes; return mPrincipalInfo.get_NullPrincipalInfo().attrs();
} }
const ipc::PrincipalInfo& PrincipalInfo() const { return mPrincipalInfo; } const ipc::PrincipalInfo& PrincipalInfo() const { return mPrincipalInfo; }
@ -80,7 +80,6 @@ class WorkletImpl {
virtual already_AddRefed<dom::WorkletGlobalScope> ConstructGlobalScope() = 0; virtual already_AddRefed<dom::WorkletGlobalScope> ConstructGlobalScope() = 0;
const OriginAttributes mOriginAttributes;
// Modified only in constructor. // Modified only in constructor.
ipc::PrincipalInfo mPrincipalInfo; ipc::PrincipalInfo mPrincipalInfo;
// Accessed on only worklet parent thread. // Accessed on only worklet parent thread.