diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-07-06 15:53:52 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-07-06 15:53:52 +0200 |
commit | 941e54654eabed0a3568f7fefe424a45aa02eddb (patch) | |
tree | 49aa02b174c428962d99142d8061267bfcd79e69 /dom/notification/Notification.cpp | |
parent | ad9ee72dcd7981bc47b3844a224d69fadfdfd8ef (diff) | |
parent | 0daa12376295d5d796256a116eb2a348a3a9273f (diff) | |
download | UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.gz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.lz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.tar.xz UXP-941e54654eabed0a3568f7fefe424a45aa02eddb.zip |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into _testBranch_test_1
Diffstat (limited to 'dom/notification/Notification.cpp')
-rw-r--r-- | dom/notification/Notification.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp index 9c0ce2f18..1dd5724e4 100644 --- a/dom/notification/Notification.cpp +++ b/dom/notification/Notification.cpp @@ -1881,7 +1881,7 @@ Notification::GetPermission(nsIGlobalObject* aGlobal, ErrorResult& aRv) MOZ_ASSERT(worker); RefPtr<GetPermissionRunnable> r = new GetPermissionRunnable(worker); - r->Dispatch(aRv); + r->Dispatch(Terminating, aRv); if (aRv.Failed()) { return NotificationPermission::Denied; } @@ -2484,7 +2484,7 @@ NotificationWorkerHolder::Notify(Status aStatus) RefPtr<CloseNotificationRunnable> r = new CloseNotificationRunnable(kungFuDeathGrip); ErrorResult rv; - r->Dispatch(rv); + r->Dispatch(Killing, rv); // XXXbz I'm told throwing and returning false from here is pointless (and // also that doing sync stuff from here is really weird), so I guess we just // suppress the exception on rv, if any. @@ -2627,7 +2627,7 @@ Notification::ShowPersistentNotification(JSContext* aCx, worker->AssertIsOnWorkerThread(); RefPtr<CheckLoadRunnable> loadChecker = new CheckLoadRunnable(worker, NS_ConvertUTF16toUTF8(aScope)); - loadChecker->Dispatch(aRv); + loadChecker->Dispatch(Terminating, aRv); if (aRv.Failed()) { return nullptr; } |