Source/modules/bluetooth/BluetoothGATTService.cpp - Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/modules/bluetooth/BluetoothGATTService.cpp

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fix webusb ScriptPromiseResolver usage Created 5 years, 4 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 | « Source/modules/bluetooth/BluetoothGATTRemoteServer.cpp ('k') | Source/modules/cachestorage/Cache.cpp » ('j') | no next file with comments »

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"

(...skipping 22 matching lines...) Expand all Loading...
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 = BluetoothSupplement::from(scriptState);	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 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