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

Bug 1462069 P1 Make ServiceWorkerManager::MaybeClaimClient() take a ClientInfo instead of nsIDocument. r=baku

Browse Source
This commit is contained in:
Ben Kelly 2018-06-04 09:10:50 -07:00
parent 30c31f92b2
commit f5141d8667
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/clients/manager/ClientSource.cpp
View File

@ -640,7 +640,7 @@ ClientSource::Claim(const ClientClaimArgs& aArgs)
auto holder =
MakeRefPtr<DOMMozPromiseRequestHolder<GenericPromise>>(innerWindow->AsGlobal());
RefPtr<GenericPromise> p = swm->MaybeClaimClient(doc, swd);
RefPtr<GenericPromise> p = swm->MaybeClaimClient(mClientInfo, swd);
p->Then(mEventTarget, __func__,
[outerPromise, holder] (bool aResult) {
holder->Complete();

26
dom/serviceworkers/ServiceWorkerManager.cpp
View File

@ -2554,7 +2554,7 @@ ServiceWorkerManager::UpdateInternal(nsIPrincipal* aPrincipal,
}
already_AddRefed<GenericPromise>
ServiceWorkerManager::MaybeClaimClient(nsIDocument* aDocument,
ServiceWorkerManager::MaybeClaimClient(const ClientInfo& aClientInfo,
ServiceWorkerRegistrationInfo* aWorkerRegistration)
{
MOZ_DIAGNOSTIC_ASSERT(aWorkerRegistration);
@ -2568,26 +2568,19 @@ ServiceWorkerManager::MaybeClaimClient(nsIDocument* aDocument,
}
// Same origin check
if (!aWorkerRegistration->Principal()->Equals(aDocument->NodePrincipal())) {
nsCOMPtr<nsIPrincipal> principal(aClientInfo.GetPrincipal());
if (!aWorkerRegistration->Principal()->Equals(principal)) {
ref = GenericPromise::CreateAndReject(NS_ERROR_DOM_SECURITY_ERR, __func__);
return ref.forget();
}
Maybe<ClientInfo> clientInfo(aDocument->GetClientInfo());
if (NS_WARN_IF(clientInfo.isNothing())) {
ref = GenericPromise::CreateAndReject(NS_ERROR_DOM_INVALID_STATE_ERR,
__func__);
return ref.forget();
}
// The registration that should be controlling the client
RefPtr<ServiceWorkerRegistrationInfo> matchingRegistration =
GetServiceWorkerRegistrationInfo(aDocument);
GetServiceWorkerRegistrationInfo(aClientInfo);
// The registration currently controlling the client
RefPtr<ServiceWorkerRegistrationInfo> controllingRegistration;
GetClientRegistration(clientInfo.ref(),
getter_AddRefs(controllingRegistration));
GetClientRegistration(aClientInfo, getter_AddRefs(controllingRegistration));
if (aWorkerRegistration != matchingRegistration ||
aWorkerRegistration == controllingRegistration) {
@ -2595,18 +2588,17 @@ ServiceWorkerManager::MaybeClaimClient(nsIDocument* aDocument,
return ref.forget();
}
ref = StartControllingClient(clientInfo.ref(), aWorkerRegistration);
ref = StartControllingClient(aClientInfo, aWorkerRegistration);
return ref.forget();
}
already_AddRefed<GenericPromise>
ServiceWorkerManager::MaybeClaimClient(nsIDocument* aDoc,
ServiceWorkerManager::MaybeClaimClient(const ClientInfo& aClientInfo,
const ServiceWorkerDescriptor& aServiceWorker)
{
RefPtr<GenericPromise> ref;
nsCOMPtr<nsIPrincipal> principal =
PrincipalInfoToPrincipal(aServiceWorker.PrincipalInfo());
nsCOMPtr<nsIPrincipal> principal = aServiceWorker.GetPrincipal();
if (!principal) {
ref = GenericPromise::CreateAndResolve(false, __func__);
return ref.forget();
@ -2625,7 +2617,7 @@ ServiceWorkerManager::MaybeClaimClient(nsIDocument* aDoc,
return ref.forget();
}
ref = MaybeClaimClient(aDoc, registration);
ref = MaybeClaimClient(aClientInfo, registration);
return ref.forget();
}

4
dom/serviceworkers/ServiceWorkerManager.h
View File

@ -285,11 +285,11 @@ public:
JSExnType aExnType);
already_AddRefed<GenericPromise>
MaybeClaimClient(nsIDocument* aDocument,
MaybeClaimClient(const ClientInfo& aClientInfo,
ServiceWorkerRegistrationInfo* aWorkerRegistration);
already_AddRefed<GenericPromise>
MaybeClaimClient(nsIDocument* aDoc,
MaybeClaimClient(const ClientInfo& aClientInfo,
const ServiceWorkerDescriptor& aServiceWorker);
void