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

Unified Diff: third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.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/bluetooth/BluetoothRemoteGATTServer.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
index 6fa5e8feccc837cca7c891d382e1b444babe4993..c9d3cd119f2dbfdf0f15a8a341dd5fb68e033336 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
@@ -60,8 +60,7 @@ class ConnectCallback : public WebBluetoothRemoteGATTServerConnectCallbacks {
: m_device(device), m_resolver(resolver) {}
void onSuccess() override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
m_device->gatt()->setConnected(true);
m_resolver->resolve(m_device->gatt());
@@ -71,8 +70,7 @@ class ConnectCallback : public WebBluetoothRemoteGATTServerConnectCallbacks {
int32_t
error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
m_resolver->reject(BluetoothError::take(m_resolver, error));
}
@@ -126,8 +124,7 @@ class GetPrimaryServicesCallback
void onSuccess(
const WebVector<WebBluetoothRemoteGATTService*>& webServices) override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
// If the resolver is not in the set of ActiveAlgorithms then the frame
@@ -158,8 +155,7 @@ class GetPrimaryServicesCallback
int32_t
error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
override {
- if (!m_resolver->getExecutionContext() ||
- m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
+ if (!m_resolver->getExecutionContext())
return;
if (!m_device->gatt()->RemoveFromActiveAlgorithms(m_resolver.get())) {

Powered by Google App Engine
This is Rietveld 408576698