| Index: third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
|
| diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
|
| index d55e5e678faadcf9c756acef6b4d47e1ea467605..f19b0a7cf1aa7ce074d8df16928af85f6a7bcd0c 100644
|
| --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
|
| +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
|
| @@ -133,7 +133,7 @@ class ReadValueCallback : public WebBluetoothReadValueCallbacks {
|
|
|
| void onSuccess(const WebVector<uint8_t>& value) override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_characteristic->gatt()->RemoveFromActiveAlgorithms(
|
| @@ -155,7 +155,7 @@ class ReadValueCallback : public WebBluetoothReadValueCallbacks {
|
| error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
|
| override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_characteristic->gatt()->RemoveFromActiveAlgorithms(
|
| @@ -212,7 +212,7 @@ class WriteValueCallback : public WebBluetoothWriteValueCallbacks {
|
|
|
| void onSuccess(const WebVector<uint8_t>& value) override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_characteristic->gatt()->RemoveFromActiveAlgorithms(
|
| @@ -233,7 +233,7 @@ class WriteValueCallback : public WebBluetoothWriteValueCallbacks {
|
| error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
|
| override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_characteristic->gatt()->RemoveFromActiveAlgorithms(
|
| @@ -305,7 +305,7 @@ class NotificationsCallback : public WebBluetoothNotificationsCallbacks {
|
|
|
| void onSuccess() override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_characteristic->gatt()->RemoveFromActiveAlgorithms(
|
| @@ -323,7 +323,7 @@ class NotificationsCallback : public WebBluetoothNotificationsCallbacks {
|
| error /* Corresponds to WebBluetoothResult in web_bluetooth.mojom */)
|
| override {
|
| if (!m_resolver->getExecutionContext() ||
|
| - m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
|
| + m_resolver->getExecutionContext()->isContextDestroyed())
|
| return;
|
|
|
| if (!m_characteristic->gatt()->RemoveFromActiveAlgorithms(
|
|
|