Bug 1442453 - Fix a typo in this member name. r=baku
MozReview-Commit-ID: Ds7yRFn04NK
--- a/dom/payments/ipc/PaymentRequestParent.cpp
+++ b/dom/payments/ipc/PaymentRequestParent.cpp
@@ -15,25 +15,25 @@
#include "PaymentRequestParent.h"
namespace mozilla {
namespace dom {
NS_IMPL_ISUPPORTS(PaymentRequestParent, nsIPaymentActionCallback)
PaymentRequestParent::PaymentRequestParent(uint64_t aTabId)
- : mActorAlived(true)
+ : mActorAlive(true)
, mTabId(aTabId)
{
}
mozilla::ipc::IPCResult
PaymentRequestParent::RecvRequestPayment(const IPCPaymentActionRequest& aRequest)
{
- if (!mActorAlived) {
+ if (!mActorAlive) {
return IPC_FAIL_NO_REASON(this);
}
nsCOMPtr<nsIPaymentActionRequest> action;
nsCOMPtr<nsIPaymentActionCallback> callback = do_QueryInterface(this);
MOZ_ASSERT(callback);
nsresult rv;
switch (aRequest.type()) {
case IPCPaymentActionRequest::TIPCPaymentCreateActionRequest: {
@@ -173,17 +173,17 @@ PaymentRequestParent::RespondPayment(nsI
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction("PaymentRequestParent::RespondPayment",
[self, response] ()
{
self->RespondPayment(response);
});
return NS_DispatchToMainThread(r);
}
- if (!mActorAlived) {
+ if (!mActorAlive) {
return NS_ERROR_FAILURE;
}
uint32_t type;
nsresult rv = aResponse->GetType(&type);
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString requestId;
rv = aResponse->GetRequestId(requestId);
NS_ENSURE_SUCCESS(rv, rv);
@@ -271,17 +271,17 @@ PaymentRequestParent::ChangeShippingAddr
nsAutoString requestId(aRequestId);
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction("dom::PaymentRequestParent::ChangeShippingAddress",
[self, requestId, address] ()
{
self->ChangeShippingAddress(requestId, address);
});
return NS_DispatchToMainThread(r);
}
- if (!mActorAlived) {
+ if (!mActorAlive) {
return NS_ERROR_FAILURE;
}
nsAutoString country;
nsresult rv = aAddress->GetCountry(country);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIArray> iaddressLine;
rv = aAddress->GetAddressLine(getter_AddRefs(iaddressLine));
@@ -357,38 +357,38 @@ PaymentRequestParent::ChangeShippingOpti
nsAutoString option(aOption);
nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction("dom::PaymentRequestParent::ChangeShippingOption",
[self, requestId, option] ()
{
self->ChangeShippingOption(requestId, option);
});
return NS_DispatchToMainThread(r);
}
- if (!mActorAlived) {
+ if (!mActorAlive) {
return NS_ERROR_FAILURE;
}
nsAutoString requestId(aRequestId);
nsAutoString option(aOption);
if (!SendChangeShippingOption(requestId, option)) {
return NS_ERROR_FAILURE;
}
return NS_OK;
}
mozilla::ipc::IPCResult
PaymentRequestParent::Recv__delete__()
{
- mActorAlived = false;
+ mActorAlive = false;
return IPC_OK();
}
void
PaymentRequestParent::ActorDestroy(ActorDestroyReason aWhy)
{
- mActorAlived = false;
+ mActorAlive = false;
nsCOMPtr<nsIPaymentRequestService> service =
do_GetService(NS_PAYMENT_REQUEST_SERVICE_CONTRACT_ID);
MOZ_ASSERT(service);
nsCOMPtr<nsIPaymentActionCallback> callback = do_QueryInterface(this);
MOZ_ASSERT(callback);
nsresult rv = service->RemoveActionCallback(callback);
if (NS_WARN_IF(NS_FAILED(rv))) {
MOZ_ASSERT(false);
--- a/dom/payments/ipc/PaymentRequestParent.h
+++ b/dom/payments/ipc/PaymentRequestParent.h
@@ -30,16 +30,16 @@ protected:
void ActorDestroy(ActorDestroyReason aWhy) override;
private:
~PaymentRequestParent() = default;
nsresult CreateActionRequest(const nsAString& aRequestId,
uint32_t aActionType,
nsIPaymentActionRequest** aAction);
- bool mActorAlived;
+ bool mActorAlive;
uint64_t mTabId;
};
} // end of namespace dom
} // end of namespace mozilla
#endif