third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp - Issue 1399623003: bluetooth: Change BluetoothSupplement::from(ScriptState*) to from(LocalFrame*)

Side by Side Diff: third_party/WebKit/Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp

Issue 1399623003: bluetooth: Change BluetoothSupplement::from(ScriptState*) to from(LocalFrame*) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin

Patch Set: Add assert for supplement and changed to use executionContext Created 5 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 unified diff | Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothGATTService.cpp » ('j') | third_party/WebKit/Source/modules/bluetooth/BluetoothSupplement.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/BluetoothGATTRemoteServer.h"	6 #include "modules/bluetooth/BluetoothGATTRemoteServer.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"

(...skipping 14 matching lines...) Expand all Loading...
25 }	25 }

26	26

27 BluetoothGATTRemoteServer* BluetoothGATTRemoteServer::take(ScriptPromiseResolver *, PassOwnPtr<WebBluetoothGATTRemoteServer> webGATT)	27 BluetoothGATTRemoteServer* BluetoothGATTRemoteServer::take(ScriptPromiseResolver *, PassOwnPtr<WebBluetoothGATTRemoteServer> webGATT)

28 {	28 {

29 ASSERT(webGATT);	29 ASSERT(webGATT);

30 return new BluetoothGATTRemoteServer(webGATT);	30 return new BluetoothGATTRemoteServer(webGATT);

31 }	31 }

32	32

33 ScriptPromise BluetoothGATTRemoteServer::getPrimaryService(ScriptState* scriptSt ate, const StringOrUnsignedLong& service, ExceptionState& exceptionState)	33 ScriptPromise BluetoothGATTRemoteServer::getPrimaryService(ScriptState* scriptSt ate, const StringOrUnsignedLong& service, ExceptionState& exceptionState)

34 {	34 {

35 WebBluetooth* webbluetooth = BluetoothSupplement::from(scriptState);	35 WebBluetooth* webbluetooth = BluetoothSupplement::fromScriptState(scriptStat e);

36	36

37 String serviceUUID = BluetoothUUID::getService(service, exceptionState);	37 String serviceUUID = BluetoothUUID::getService(service, exceptionState);

38 if (exceptionState.hadException())	38 if (exceptionState.hadException())

39 return exceptionState.reject(scriptState);	39 return exceptionState.reject(scriptState);

40	40

41 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;	41 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;

42 ScriptPromise promise = resolver->promise();	42 ScriptPromise promise = resolver->promise();

43 webbluetooth->getPrimaryService(m_webGATT->deviceInstanceID, serviceUUID, ne w CallbackPromiseAdapter<BluetoothGATTService, BluetoothError>(resolver));	43 webbluetooth->getPrimaryService(m_webGATT->deviceInstanceID, serviceUUID, ne w CallbackPromiseAdapter<BluetoothGATTService, BluetoothError>(resolver));

44	44

45 return promise;	45 return promise;

46 }	46 }

47	47

48 } // namespace blink	48 } // namespace blink

OLD	NEW