| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "modules/bluetooth/BluetoothGATTService.h" | 6 #include "modules/bluetooth/BluetoothGATTService.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/CallbackPromiseAdapter.h" | 8 #include "bindings/core/v8/CallbackPromiseAdapter.h" |
| 9 #include "bindings/core/v8/ScriptPromise.h" | 9 #include "bindings/core/v8/ScriptPromise.h" |
| 10 #include "bindings/core/v8/ScriptPromiseResolver.h" | 10 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 11 #include "core/dom/DOMException.h" | 11 #include "core/dom/DOMException.h" |
| 12 #include "core/dom/ExceptionCode.h" | 12 #include "core/dom/ExceptionCode.h" |
| 13 #include "modules/bluetooth/BluetoothError.h" | 13 #include "modules/bluetooth/BluetoothError.h" |
| 14 #include "modules/bluetooth/BluetoothGATTCharacteristic.h" | 14 #include "modules/bluetooth/BluetoothGATTCharacteristic.h" |
| 15 #include "modules/bluetooth/BluetoothSupplement.h" |
| 15 #include "modules/bluetooth/BluetoothUUID.h" | 16 #include "modules/bluetooth/BluetoothUUID.h" |
| 16 #include "public/platform/Platform.h" | |
| 17 #include "public/platform/modules/bluetooth/WebBluetooth.h" | 17 #include "public/platform/modules/bluetooth/WebBluetooth.h" |
| 18 | 18 |
| 19 namespace blink { | 19 namespace blink { |
| 20 | 20 |
| 21 BluetoothGATTService::BluetoothGATTService(PassOwnPtr<WebBluetoothGATTService> w
ebService) | 21 BluetoothGATTService::BluetoothGATTService(PassOwnPtr<WebBluetoothGATTService> w
ebService) |
| 22 : m_webService(webService) | 22 : m_webService(webService) |
| 23 { | 23 { |
| 24 } | 24 } |
| 25 | 25 |
| 26 BluetoothGATTService* BluetoothGATTService::take(ScriptPromiseResolver*, PassOwn
Ptr<WebBluetoothGATTService> webService) | 26 BluetoothGATTService* BluetoothGATTService::take(ScriptPromiseResolver*, PassOwn
Ptr<WebBluetoothGATTService> webService) |
| 27 { | 27 { |
| 28 if (!webService) { | 28 if (!webService) { |
| 29 return nullptr; | 29 return nullptr; |
| 30 } | 30 } |
| 31 return new BluetoothGATTService(webService); | 31 return new BluetoothGATTService(webService); |
| 32 } | 32 } |
| 33 | 33 |
| 34 ScriptPromise BluetoothGATTService::getCharacteristic(ScriptState* scriptState, | 34 ScriptPromise BluetoothGATTService::getCharacteristic(ScriptState* scriptState, |
| 35 const StringOrUnsignedLong& characteristic, ExceptionState& exceptionState) | 35 const StringOrUnsignedLong& characteristic, ExceptionState& exceptionState) |
| 36 { | 36 { |
| 37 WebBluetooth* webbluetooth = Platform::current()->bluetooth(); | 37 WebBluetooth* webbluetooth = BluetoothSupplement::from(scriptState); |
| 38 | 38 |
| 39 String characteristicUUID = BluetoothUUID::getCharacteristic(characteristic,
exceptionState); | 39 String characteristicUUID = BluetoothUUID::getCharacteristic(characteristic,
exceptionState); |
| 40 if (exceptionState.hadException()) | 40 if (exceptionState.hadException()) |
| 41 return exceptionState.reject(scriptState); | 41 return exceptionState.reject(scriptState); |
| 42 | 42 |
| 43 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::
create(scriptState); | 43 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::
create(scriptState); |
| 44 ScriptPromise promise = resolver->promise(); | 44 ScriptPromise promise = resolver->promise(); |
| 45 webbluetooth->getCharacteristic(m_webService->serviceInstanceID, characteris
ticUUID, new CallbackPromiseAdapter<BluetoothGATTCharacteristic, BluetoothError>
(resolver)); | 45 webbluetooth->getCharacteristic(m_webService->serviceInstanceID, characteris
ticUUID, new CallbackPromiseAdapter<BluetoothGATTCharacteristic, BluetoothError>
(resolver)); |
| 46 | 46 |
| 47 return promise; | 47 return promise; |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace blink | 50 } // namespace blink |
| OLD | NEW |