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

Bug 1462069 P2 Make ClientManagerService forward claim() requests to the main thread SWM when the pref is set. r=baku

Browse Source
This commit is contained in:
Ben Kelly 2018-06-01 13:39:57 -07:00
parent 6d1736c617
commit 9e0e3a5c87
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dom/clients/manager/ClientManagerService.cpp
View File

@ -13,6 +13,8 @@
#include "ClientPrincipalUtils.h"
#include "ClientSourceParent.h"
#include "mozilla/dom/ContentParent.h"
#include "mozilla/dom/ServiceWorkerManager.h"
#include "mozilla/dom/ServiceWorkerUtils.h"
#include "mozilla/ipc/BackgroundParent.h"
#include "mozilla/ipc/PBackgroundSharedTypes.h"
#include "mozilla/ClearOnShutdown.h"
@ -448,6 +450,40 @@ ClientManagerService::MatchAll(const ClientMatchAllArgs& aArgs)
return promiseList->GetResultPromise();
}
namespace {
RefPtr<ClientOpPromise>
ClaimOnMainThread(const ClientInfo& aClientInfo,
const ServiceWorkerDescriptor& aDescriptor)
{
RefPtr<ClientOpPromise::Private> promise =
new ClientOpPromise::Private(__func__);
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction(__func__,
[promise, clientInfo = Move(aClientInfo), desc = Move(aDescriptor)] () {
auto scopeExit = MakeScopeExit([&] {
promise->Reject(NS_ERROR_DOM_INVALID_STATE_ERR, __func__);
});
RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
NS_ENSURE_TRUE_VOID(swm);
RefPtr<GenericPromise> inner = swm->MaybeClaimClient(clientInfo, desc);
inner->Then(SystemGroup::EventTargetFor(TaskCategory::Other), __func__,
[promise] (bool aResult) {
promise->Resolve(NS_OK, __func__);
}, [promise] (nsresult aRv) {
promise->Reject(aRv, __func__);
});
});
MOZ_ALWAYS_SUCCEEDS(SystemGroup::Dispatch(TaskCategory::Other, r.forget()));
return promise.forget();
}
} // anonymous namespace
RefPtr<ClientOpPromise>
ClientManagerService::Claim(const ClientClaimArgs& aArgs)
{
@ -487,7 +523,13 @@ ClientManagerService::Claim(const ClientClaimArgs& aArgs)
continue;
}
promiseList->AddPromise(source->StartOp(aArgs));
if (ServiceWorkerParentInterceptEnabled()) {
promiseList->AddPromise(
ClaimOnMainThread(source->Info(),
ServiceWorkerDescriptor(serviceWorker)));
} else {
promiseList->AddPromise(source->StartOp(aArgs));
}
}
// Maybe finish the promise now in case we didn't find any matching clients.