public/platform/modules/bluetooth/WebBluetooth.h - Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3).

Unified Diff: public/platform/modules/bluetooth/WebBluetooth.h

Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« Source/bindings/core/v8/CallbackPromiseAdapter.h ('K') | « public/platform/modules/app_banner/WebAppBannerClient.h ('k') | public/platform/modules/notifications/WebNotificationManager.h » ('j') | public/platform/modules/push_messaging/WebPushProvider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: public/platform/modules/bluetooth/WebBluetooth.h

diff --git a/public/platform/modules/bluetooth/WebBluetooth.h b/public/platform/modules/bluetooth/WebBluetooth.h

index d67b12999059b6c91de99e5bff059df29c5a5841..02c19502f60719a8fca6e2cfcddbe8e231345182 100644

--- a/public/platform/modules/bluetooth/WebBluetooth.h

+++ b/public/platform/modules/bluetooth/WebBluetooth.h

@@ -22,27 +22,27 @@ struct WebRequestDeviceOptions;

// Success and failure callbacks for requestDevice.

// WebBluetoothDevice and WebBluetoothError object ownership is transferred.

-using WebBluetoothRequestDeviceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothDevice>, WebPassOwnPtr<WebBluetoothError>>;

+using WebBluetoothRequestDeviceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothDevice>, const WebBluetoothError&>;

// Success and failure callbacks for connectGATT.

// WebBluetoothGATTRemoteServer and WebBluetoothError object ownership is transferred.

-using WebBluetoothConnectGATTCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTRemoteServer>, WebPassOwnPtr<WebBluetoothError>>;

+using WebBluetoothConnectGATTCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTRemoteServer>, const WebBluetoothError&>;

// Success and failure callbacks for getPrimaryService.

// WebBluetoothGATTService and WebBluetoothError object ownership is transferred.

-using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTService>, WebPassOwnPtr<WebBluetoothError>>;

+using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTService>, const WebBluetoothError&>;

// Success and failure callbacks for getCharacteristic.

// WebBluetoothCharacteristic and WebBluetoothError object ownership is transferred.

-using WebBluetoothGetCharacteristicCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTCharacteristic>, WebPassOwnPtr<WebBluetoothError>>;

+using WebBluetoothGetCharacteristicCallbacks = WebCallbacks<WebPassOwnPtr<WebBluetoothGATTCharacteristic>, const WebBluetoothError&>;

// Success and failure callbacks for readValue.

// WebVector and WebBluetoothError object ownership is transferred.

-using WebBluetoothReadValueCallbacks = WebCallbacks<WebPassOwnPtr<WebVector<uint8_t>>, WebPassOwnPtr<WebBluetoothError>>;

+using WebBluetoothReadValueCallbacks = WebCallbacks<const WebVector<uint8_t>&, const WebBluetoothError&>;

// Success and failure callbacks for writeValue.

// WebBluetoothError object ownership is transferred.

-using WebBluetoothWriteValueCallbacks = WebCallbacks<void, WebPassOwnPtr<WebBluetoothError>>;

+using WebBluetoothWriteValueCallbacks = WebCallbacks<void, const WebBluetoothError&>;

class WebBluetooth {

public: