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

Bug 1572084 - Part 3: Force session store flush order. r=nika

Browse Source 
We need a call to nsFrameLoader::RequestTabStateFlush to flush the
toplevel context first. That way we can ensure that session storage is
flushed consistently.

Differential Revision: https://phabricator.services.mozilla.com/D108938
This commit is contained in:
Andreas Farre 2021-03-25 15:36:38 +00:00
parent 728f061c16
commit a4da022c74
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
dom/base/nsFrameLoader.cpp
View File

@ -3169,7 +3169,7 @@ already_AddRefed<Promise> nsFrameLoader::RequestTabStateFlush(
return nullptr;
}
BrowsingContext* context = GetExtantBrowsingContext();
RefPtr<BrowsingContext> context = GetExtantBrowsingContext();
if (!context) {
promise->MaybeResolveWithUndefined();
return promise.forget();
@ -3184,21 +3184,36 @@ already_AddRefed<Promise> nsFrameLoader::RequestTabStateFlush(
return promise.forget();
}
nsTArray<RefPtr<ContentParent::FlushTabStatePromise>> flushPromises;
context->Group()->EachParent([&](ContentParent* aParent) {
if (aParent->CanSend()) {
flushPromises.AppendElement(aParent->SendFlushTabState(context));
}
});
// XXX(farre): We hack around not having fully implemented session
// store session storage collection in the parent. What we need to
// do is to make sure that we always flush the toplevel context
// first. And also to wait for that flush to resolve. This will be
// fixed by moving session storage collection to the parent, which
// will happen in Bug 1700623.
RefPtr<ContentParent> contentParent =
context->Canonical()->GetContentParent();
using FlushPromise = ContentParent::FlushTabStatePromise;
contentParent->SendFlushTabState(context)->Then(
GetCurrentSerialEventTarget(), __func__,
[promise, context,
contentParent](const FlushPromise::ResolveOrRejectValue&) {
nsTArray<RefPtr<FlushPromise>> flushPromises;
context->Group()->EachOtherParent(
contentParent, [&](ContentParent* aParent) {
if (aParent->CanSend()) {
flushPromises.AppendElement(
aParent->SendFlushTabState(context));
}
});
using ResultType =
ContentParent::FlushTabStatePromise::AllPromiseType::ResolveOrRejectValue;
ContentParent::FlushTabStatePromise::All(GetCurrentSerialEventTarget(),
flushPromises)
->Then(GetCurrentSerialEventTarget(), __func__,
[promise](const ResultType&) {
promise->MaybeResolveWithUndefined();
});
FlushPromise::All(GetCurrentSerialEventTarget(), flushPromises)
->Then(
GetCurrentSerialEventTarget(), __func__,
[promise](
const FlushPromise::AllPromiseType::ResolveOrRejectValue&) {
promise->MaybeResolveWithUndefined();
});
});
return promise.forget();
}