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

Backed out changeset 7b759128b1ce (bug 1843453) for causing mochitests failures in test_simple.html.

Browse Source
This commit is contained in:
Stanca Serban 2023-07-24 23:18:54 +03:00
parent 61cd126457
commit d9cfb537bd
5 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/credentialmanagement/identity/IdentityCredential.cpp
View File

@ -808,8 +808,6 @@ IdentityCredential::PromptUserToSelectProvider(
resultPromise->Reject(
Promise::TryExtractNSResultFromRejectionValue(aValue), __func__);
});
showPromptPromise->AppendNativeHandler(
new MozPromiseRejectOnDestruction(resultPromise));
return resultPromise;
}
@ -888,8 +886,6 @@ IdentityCredential::PromptUserToSelectAccount(
resultPromise->Reject(
Promise::TryExtractNSResultFromRejectionValue(aValue), __func__);
});
showPromptPromise->AppendNativeHandler(
new MozPromiseRejectOnDestruction(resultPromise));
return resultPromise;
}
@ -1011,8 +1007,6 @@ IdentityCredential::PromptUserWithPolicy(
Promise::TryExtractNSResultFromRejectionValue(aValue),
__func__);
});
showPromptPromise->AppendNativeHandler(
new MozPromiseRejectOnDestruction(resultPromise));
return resultPromise;
},
[](nsresult error) {

4
dom/credentialmanagement/identity/IdentityNetworkHelpers.h
View File

@ -93,15 +93,11 @@ RefPtr<TPromise> FetchJSONStructure(Request* aRequest) {
Promise::TryExtractNSResultFromRejectionValue(aValue),
__func__);
});
jsonPromise->AppendNativeHandler(
new MozPromiseRejectOnDestruction(resultPromise));
},
[resultPromise](JSContext*, JS::Handle<JS::Value> aValue, ErrorResult&) {
resultPromise->Reject(
Promise::TryExtractNSResultFromRejectionValue(aValue), __func__);
});
fetchPromise->AppendNativeHandler(
new MozPromiseRejectOnDestruction(resultPromise));
return resultPromise;
}

2
dom/promise/PromiseNativeHandler.cpp
View File

@ -13,8 +13,6 @@
namespace mozilla::dom {
NS_IMPL_ISUPPORTS0(MozPromiseRejectOnDestructionBase)
NS_IMPL_ISUPPORTS0(DomPromiseListener)
DomPromiseListener::DomPromiseListener(CallbackTypeResolved&& aResolve,

36
dom/promise/PromiseNativeHandler.h
View File

@ -35,42 +35,6 @@ class PromiseNativeHandler : public nsISupports {
ErrorResult& aRv) = 0;
};
// This base class exists solely to use NS_IMPL_ISUPPORTS because it doesn't
// support template classes.
class MozPromiseRejectOnDestructionBase : public PromiseNativeHandler {
NS_DECL_ISUPPORTS
void ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue,
ErrorResult& aRv) override {}
void RejectedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue,
ErrorResult& aRv) override {}
protected:
~MozPromiseRejectOnDestructionBase() override = default;
};
// Use this when you subscribe to a JS promise to settle a MozPromise that is
// not guaranteed to be settled by anyone else.
template <typename T>
class MozPromiseRejectOnDestruction final
: public MozPromiseRejectOnDestructionBase {
public:
// (Accepting RefPtr<T> instead of T* because compiler fails to implicitly
// convert it at call sites)
explicit MozPromiseRejectOnDestruction(const RefPtr<T>& aMozPromise)
: mMozPromise(aMozPromise) {
MOZ_ASSERT(aMozPromise);
}
protected:
~MozPromiseRejectOnDestruction() override {
// Rejecting will be no-op if the promise is already settled
mMozPromise->Reject(NS_BINDING_ABORTED, __func__);
}
RefPtr<T> mMozPromise;
};
// This class is used to set C++ callbacks once a dom Promise a resolved or
// rejected.
class DomPromiseListener final : public PromiseNativeHandler {

3
testing/web-platform/meta/credential-management/fedcm-csp.https.html.ini
View File

@ -1,6 +1,7 @@
[fedcm-csp.https.html]
expected:
if os == "mac": [TIMEOUT, OK]
if os == "linux": [CRASH, TIMEOUT]
if os == "mac": [TIMEOUT, OK, CRASH]
TIMEOUT
[Provider configURL should honor Content-Security-Policy.]
expected: