Commit b573ef8f authored by Miyoung Shin's avatar Miyoung Shin Committed by Commit Bot

Change short/int16_t to uint16_t in third_party/blink/renderer/modules/bluetooth

- short/int16_t -> uint16_t considering importing the value from web_bluetooth.mojom
  and exporting the value through bluetooth_advertising_event.idl.
- Reference: https://google.github.io/styleguide/cppguide.html#Integer_Types

Bug: 929985
Change-Id: Ib910dce00f0382fa7688547583d9c09d65272e5f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1501772Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637576}
parent 3727f2c5
...@@ -371,7 +371,7 @@ void Bluetooth::ScanEvent(mojom::blink::WebBluetoothScanResultPtr result) { ...@@ -371,7 +371,7 @@ void Bluetooth::ScanEvent(mojom::blink::WebBluetoothScanResultPtr result) {
if (result->tx_power_is_set) if (result->tx_power_is_set)
tx_power = result->tx_power; tx_power = result->tx_power;
base::Optional<int16_t> appearance; base::Optional<uint16_t> appearance;
if (result->appearance_is_set) if (result->appearance_is_set)
appearance = result->appearance; appearance = result->appearance;
......
...@@ -31,7 +31,7 @@ BluetoothAdvertisingEvent::BluetoothAdvertisingEvent( ...@@ -31,7 +31,7 @@ BluetoothAdvertisingEvent::BluetoothAdvertisingEvent(
BluetoothDevice* device, BluetoothDevice* device,
const String& name, const String& name,
const HeapVector<StringOrUnsignedLong>& uuids, const HeapVector<StringOrUnsignedLong>& uuids,
base::Optional<short> appearance, base::Optional<uint16_t> appearance,
base::Optional<int8_t> txPower, base::Optional<int8_t> txPower,
base::Optional<int8_t> rssi, base::Optional<int8_t> rssi,
BluetoothManufacturerDataMap* manufacturerData, BluetoothManufacturerDataMap* manufacturerData,
...@@ -73,7 +73,7 @@ const HeapVector<StringOrUnsignedLong>& BluetoothAdvertisingEvent::uuids() ...@@ -73,7 +73,7 @@ const HeapVector<StringOrUnsignedLong>& BluetoothAdvertisingEvent::uuids()
return uuids_; return uuids_;
} }
short BluetoothAdvertisingEvent::appearance(bool& is_null) const { uint16_t BluetoothAdvertisingEvent::appearance(bool& is_null) const {
is_null = !appearance_.has_value(); is_null = !appearance_.has_value();
return appearance_.value_or(0); return appearance_.value_or(0);
} }
......
...@@ -31,7 +31,7 @@ class BluetoothAdvertisingEvent final : public Event { ...@@ -31,7 +31,7 @@ class BluetoothAdvertisingEvent final : public Event {
BluetoothDevice* device, BluetoothDevice* device,
const String& name, const String& name,
const HeapVector<StringOrUnsignedLong>& uuids, const HeapVector<StringOrUnsignedLong>& uuids,
base::Optional<short> appearance, base::Optional<uint16_t> appearance,
base::Optional<int8_t> txPower, base::Optional<int8_t> txPower,
base::Optional<int8_t> rssi, base::Optional<int8_t> rssi,
BluetoothManufacturerDataMap* manufacturer_data_map, BluetoothManufacturerDataMap* manufacturer_data_map,
...@@ -48,7 +48,7 @@ class BluetoothAdvertisingEvent final : public Event { ...@@ -48,7 +48,7 @@ class BluetoothAdvertisingEvent final : public Event {
BluetoothDevice* device, BluetoothDevice* device,
const String& name, const String& name,
const HeapVector<StringOrUnsignedLong>& uuids, const HeapVector<StringOrUnsignedLong>& uuids,
base::Optional<short> appearance, base::Optional<uint16_t> appearance,
base::Optional<int8_t> txPower, base::Optional<int8_t> txPower,
base::Optional<int8_t> rssi, base::Optional<int8_t> rssi,
BluetoothManufacturerDataMap* manufacturer_data_map, BluetoothManufacturerDataMap* manufacturer_data_map,
...@@ -63,7 +63,7 @@ class BluetoothAdvertisingEvent final : public Event { ...@@ -63,7 +63,7 @@ class BluetoothAdvertisingEvent final : public Event {
BluetoothDevice* device() const; BluetoothDevice* device() const;
const String& name() const; const String& name() const;
const HeapVector<StringOrUnsignedLong>& uuids() const; const HeapVector<StringOrUnsignedLong>& uuids() const;
short appearance(bool& is_null) const; uint16_t appearance(bool& is_null) const;
int8_t txPower(bool& is_null) const; int8_t txPower(bool& is_null) const;
int8_t rssi(bool& is_null) const; int8_t rssi(bool& is_null) const;
BluetoothManufacturerDataMap* manufacturerData() const; BluetoothManufacturerDataMap* manufacturerData() const;
...@@ -73,7 +73,7 @@ class BluetoothAdvertisingEvent final : public Event { ...@@ -73,7 +73,7 @@ class BluetoothAdvertisingEvent final : public Event {
Member<BluetoothDevice> device_; Member<BluetoothDevice> device_;
String name_; String name_;
HeapVector<StringOrUnsignedLong> uuids_; HeapVector<StringOrUnsignedLong> uuids_;
base::Optional<short> appearance_; base::Optional<uint16_t> appearance_;
base::Optional<int8_t> txPower_; base::Optional<int8_t> txPower_;
base::Optional<int8_t> rssi_; base::Optional<int8_t> rssi_;
const Member<BluetoothManufacturerDataMap> manufacturer_data_map_; const Member<BluetoothManufacturerDataMap> manufacturer_data_map_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment