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

Bug 1512456 - P5. Refactor WaitForBgParent. r=gerald

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D14028

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jean-Yves Avenard 2018-12-11 10:46:29 +00:00
parent 3d5c3c9538
commit a73ddb5ad2
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
netwerk/protocol/http/HttpChannelParent.cpp
View File

@ -661,9 +661,8 @@ bool HttpChannelParent::DoAsyncOpen(
MOZ_ASSERT(mPromise.IsEmpty());
// Wait for HttpBackgrounChannel to continue the async open procedure.
++mAsyncOpenBarrier;
RefPtr<GenericPromise> promise = WaitForBgParent();
RefPtr<HttpChannelParent> self = this;
promise
WaitForBgParent()
->Then(GetMainThreadSerialEventTarget(), __func__,
[self]() {
self->mRequest.Complete();
@ -685,7 +684,7 @@ bool HttpChannelParent::DoAsyncOpen(
return true;
}
already_AddRefed<GenericPromise> HttpChannelParent::WaitForBgParent() {
RefPtr<GenericNonExclusivePromise> HttpChannelParent::WaitForBgParent() {
LOG(("HttpChannelParent::WaitForBgParent [this=%p]\n", this));
MOZ_ASSERT(!mBgParent);
MOZ_ASSERT(mChannel);
@ -696,10 +695,7 @@ already_AddRefed<GenericPromise> HttpChannelParent::WaitForBgParent() {
registrar->LinkHttpChannel(mChannel->ChannelId(), this);
if (mBgParent) {
RefPtr<GenericPromise> promise = mPromise.Ensure(__func__);
// resolve promise immediatedly if bg channel is ready.
mPromise.Resolve(true, __func__);
return promise.forget();
return GenericNonExclusivePromise::CreateAndResolve(true, __func__);
}
return mPromise.Ensure(__func__);
@ -757,9 +753,8 @@ bool HttpChannelParent::ConnectChannel(const uint32_t& registrarId,
MOZ_ASSERT(!mBgParent);
MOZ_ASSERT(mPromise.IsEmpty());
// Waiting for background channel
RefPtr<GenericPromise> promise = WaitForBgParent();
RefPtr<HttpChannelParent> self = this;
promise
WaitForBgParent()
->Then(GetMainThreadSerialEventTarget(), __func__,
[self]() { self->mRequest.Complete(); },
[self](const nsresult& aResult) {
@ -959,14 +954,14 @@ HttpChannelParent::ContinueVerification(
MOZ_ASSERT(!mPromise.IsEmpty());
// Otherwise, wait for the background channel.
RefPtr<GenericPromise> promise = WaitForBgParent();
nsCOMPtr<nsIAsyncVerifyRedirectReadyCallback> callback = aCallback;
promise->Then(GetMainThreadSerialEventTarget(), __func__,
[callback]() { callback->ReadyToVerify(NS_OK); },
[callback](const nsresult& aResult) {
NS_ERROR("failed to establish the background channel");
callback->ReadyToVerify(aResult);
});
WaitForBgParent()->Then(
GetMainThreadSerialEventTarget(), __func__,
[callback]() { callback->ReadyToVerify(NS_OK); },
[callback](const nsresult& aResult) {
NS_ERROR("failed to establish the background channel");
callback->ReadyToVerify(aResult);
});
return NS_OK;
}
@ -1241,9 +1236,8 @@ mozilla::ipc::IPCResult HttpChannelParent::RecvCrossProcessRedirectDone(
const nsresult& aResult) {
RefPtr<nsHttpChannel> chan = do_QueryObject(mChannel);
if (!mBgParent) {
RefPtr<GenericPromise> promise = WaitForBgParent();
RefPtr<HttpChannelParent> self = this;
promise->Then(
WaitForBgParent()->Then(
GetMainThreadSerialEventTarget(), __func__,
[self, chan, aResult]() { FinishCrossProcessRedirect(chan, aResult); },
[self, chan](const nsresult& aRejectionRv) {

6
netwerk/protocol/http/HttpChannelParent.h
View File

@ -246,7 +246,7 @@ class HttpChannelParent final : public nsIInterfaceRequestor,
// id, a promise will be returned so the caller can append callbacks on it.
// If called multiple times before mBgParent is available, the same promise
// will be returned and the callbacks will be invoked in order.
already_AddRefed<GenericPromise> WaitForBgParent();
MOZ_MUST_USE RefPtr<GenericNonExclusivePromise> WaitForBgParent();
// Remove the association with background channel after main-thread IPC
// is about to be destroyed or no further event is going to be sent, i.e.,
@ -284,8 +284,8 @@ class HttpChannelParent final : public nsIInterfaceRequestor,
RefPtr<HttpBackgroundChannelParent> mBgParent;
MozPromiseHolder<GenericPromise> mPromise;
MozPromiseRequestHolder<GenericPromise> mRequest;
MozPromiseHolder<GenericNonExclusivePromise> mPromise;
MozPromiseRequestHolder<GenericNonExclusivePromise> mRequest;
dom::TabId mNestedFrameId;