| 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 ca5b518442a24a7d2334afc5d9ee05d108a25240..b97391111c6a2f84432c34352658e710fe6c93d2 100644
|
| --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
|
| +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp
|
| @@ -62,7 +62,7 @@ class ConnectCallback : public WebBluetoothRemoteGATTServerConnectCallbacks {
|
|
|
| void onSuccess() override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
| m_device->gatt()->setConnected(true);
|
| m_resolver->resolve(m_device->gatt());
|
| @@ -73,7 +73,7 @@ class ConnectCallback : public WebBluetoothRemoteGATTServerConnectCallbacks {
|
| error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
|
| override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
| m_resolver->reject(BluetoothError::take(m_resolver, error));
|
| }
|
| @@ -125,7 +125,7 @@ class GetPrimaryServicesCallback
|
| void onSuccess(
|
| const WebVector<WebBluetoothRemoteGATTService*>& webServices) override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| // If the resolver is not in the set of ActiveAlgorithms then the frame
|
| @@ -157,7 +157,7 @@ class GetPrimaryServicesCallback
|
| error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
|
| override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_device->gatt()->RemoveFromActiveAlgorithms(m_resolver.get())) {
|
|
|