Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(743)

Unified Diff: third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp

Issue 2433773006: Remove ExecutionContext::activeDOMObjectsAreStopped()
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
diff --git a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
index f4f1fa2b06e95aaf4d8dede87d96dface23a4da5..9034f9a878fd44d085379b0a5ee00871acf2b779 100644
--- a/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
+++ b/third_party/WebKit/Source/modules/push_messaging/PushSubscriptionCallbacks.cpp
@@ -10,7 +10,7 @@
#include "modules/serviceworkers/ServiceWorkerRegistration.h"
#include "public/platform/modules/push_messaging/WebPushSubscription.h"
#include "wtf/Assertions.h"
-#include "wtf/PtrUtil.h"
+#include <utility>
namespace blink {
@@ -27,18 +27,16 @@ PushSubscriptionCallbacks::~PushSubscriptionCallbacks() {}
void PushSubscriptionCallbacks::onSuccess(
std::unique_ptr<WebPushSubscription> webPushSubscription) {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
- m_resolver->resolve(PushSubscription::take(
- m_resolver.get(), wrapUnique(webPushSubscription.release()),
- m_serviceWorkerRegistration));
+ m_resolver->resolve(PushSubscription::take(m_resolver.get(),
+ std::move(webPushSubscription),
+ m_serviceWorkerRegistration));
}
void PushSubscriptionCallbacks::onError(const WebPushError& error) {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
m_resolver->reject(PushError::take(m_resolver.get(), error));
}

Powered by Google App Engine
This is Rietveld 408576698