| Index: third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| index b763a3b6eb47faf0eebd959fe0f926914008d8ee..57585d5790b2e8c6de06b4eb55c6bb7f6d75bf60 100644
|
| --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp
|
| @@ -34,7 +34,7 @@ BluetoothDevice::BluetoothDevice(ExecutionContext* context, PassOwnPtr<WebBlueto
|
| BluetoothDevice* BluetoothDevice::take(ScriptPromiseResolver* resolver, PassOwnPtr<WebBluetoothDevice> webDevice)
|
| {
|
| ASSERT(webDevice);
|
| - BluetoothDevice* device = new BluetoothDevice(resolver->executionContext(), webDevice);
|
| + BluetoothDevice* device = new BluetoothDevice(resolver->getExecutionContext(), webDevice);
|
| device->suspendIfNeeded();
|
| return device;
|
| }
|
| @@ -60,7 +60,7 @@ bool BluetoothDevice::disconnectGATTIfConnected()
|
| {
|
| if (m_gatt->connected()) {
|
| m_gatt->setConnected(false);
|
| - BluetoothSupplement::fromExecutionContext(executionContext())->disconnect(id());
|
| + BluetoothSupplement::fromExecutionContext(getExecutionContext())->disconnect(id());
|
| return true;
|
| }
|
| return false;
|
| @@ -71,9 +71,9 @@ const WTF::AtomicString& BluetoothDevice::interfaceName() const
|
| return EventTargetNames::BluetoothDevice;
|
| }
|
|
|
| -ExecutionContext* BluetoothDevice::executionContext() const
|
| +ExecutionContext* BluetoothDevice::getExecutionContext() const
|
| {
|
| - return ActiveDOMObject::executionContext();
|
| + return ActiveDOMObject::getExecutionContext();
|
| }
|
|
|
| DEFINE_TRACE(BluetoothDevice)
|
|
|