wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1141944 - [bluetooth2] Revise device paired/unpaired handlers in BluetoothAdapter, f=jaliu, r=shuang

Browse Source
This commit is contained in:
Ben Tian 2015-03-16 16:01:59 +08:00
parent ffc3923336
commit 77163a38e8
2 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dom/bluetooth2/BluetoothAdapter.cpp
View File

@ -853,54 +853,45 @@ BluetoothAdapter::HandleDeviceFound(const BluetoothValue& aValue)
void
BluetoothAdapter::HandleDevicePaired(const BluetoothValue& aValue)
{
MOZ_ASSERT(aValue.type() == BluetoothValue::TArrayOfBluetoothNamedValue);
if (mState != BluetoothAdapterState::Enabled) {
BT_WARNING("HandleDevicePaired() is called when adapter isn't enabled.");
if (NS_WARN_IF(mState != BluetoothAdapterState::Enabled)) {
return;
}
MOZ_ASSERT(aValue.type() == BluetoothValue::TArrayOfBluetoothNamedValue);
const InfallibleTArray<BluetoothNamedValue>& arr =
aValue.get_ArrayOfBluetoothNamedValue();
MOZ_ASSERT(arr.Length() == 3 &&
arr[0].value().type() == BluetoothValue::TnsString && // Address
arr[1].value().type() == BluetoothValue::Tbool && // Paired
arr[2].value().type() == BluetoothValue::TnsString); // Name
arr[1].value().type() == BluetoothValue::TnsString && // Name
arr[2].value().type() == BluetoothValue::Tbool); // Paired
MOZ_ASSERT(!arr[0].value().get_nsString().IsEmpty() &&
arr[1].value().get_bool());
arr[2].value().get_bool());
nsString deviceAddress = arr[0].value().get_nsString();
nsRefPtr<BluetoothDevice> pairedDevice = nullptr;
// Check whether or not the address exists in mDevices.
size_t index = mDevices.IndexOf(deviceAddress);
// Append the paired device if it doesn't exist in adapter's devices array
size_t index = mDevices.IndexOf(arr[0].value().get_nsString());
if (index == mDevices.NoIndex) {
// Create a new device and append it to adapter's device array
pairedDevice = BluetoothDevice::Create(GetOwner(), aValue);
mDevices.AppendElement(pairedDevice);
} else {
// Use existing device
pairedDevice = mDevices[index];
index = mDevices.Length(); // the new device's index
mDevices.AppendElement(
BluetoothDevice::Create(GetOwner(), aValue));
}
// Notify application of paired device
BluetoothDeviceEventInit init;
init.mDevice = pairedDevice;
DispatchDeviceEvent(NS_LITERAL_STRING("devicepaired"), init);
init.mDevice = mDevices[index];
DispatchDeviceEvent(NS_LITERAL_STRING(DEVICE_PAIRED_ID), init);
}
void
BluetoothAdapter::HandleDeviceUnpaired(const BluetoothValue& aValue)
{
MOZ_ASSERT(aValue.type() == BluetoothValue::TArrayOfBluetoothNamedValue);
if (mState != BluetoothAdapterState::Enabled) {
BT_WARNING("HandleDeviceUnpaired() is called when adapter isn't enabled.");
if (NS_WARN_IF(mState != BluetoothAdapterState::Enabled)) {
return;
}
MOZ_ASSERT(aValue.type() == BluetoothValue::TArrayOfBluetoothNamedValue);
const InfallibleTArray<BluetoothNamedValue>& arr =
aValue.get_ArrayOfBluetoothNamedValue();
@ -910,15 +901,14 @@ BluetoothAdapter::HandleDeviceUnpaired(const BluetoothValue& aValue)
MOZ_ASSERT(!arr[0].value().get_nsString().IsEmpty() &&
!arr[1].value().get_bool());
nsString deviceAddress = arr[0].value().get_nsString();
// Remove the device with the same address
nsString deviceAddress = arr[0].value().get_nsString();
mDevices.RemoveElement(deviceAddress);
// Notify application of unpaired device
BluetoothDeviceEventInit init;
init.mAddress = deviceAddress;
DispatchDeviceEvent(NS_LITERAL_STRING("deviceunpaired"), init);
DispatchDeviceEvent(NS_LITERAL_STRING(DEVICE_UNPAIRED_ID), init);
}
void

19
dom/bluetooth2/BluetoothAdapter.h
View File

@ -338,19 +338,20 @@ private:
nsRefPtr<BluetoothDiscoveryHandle> mDiscoveryHandleInUse;
/**
* Arrays of references to BluetoothDevices created by this adapter.
* This array is empty when adapter state is Disabled.
* nsRefPtr array of BluetoothDevices created by this adapter. The array is
* empty when adapter state is Disabled.
*
* Devices will be appended when
* 1) Enabling BT: Paired devices reported by stack.
* 2) Discovering: Discovered devices during discovery operation.
* A device won't be appended if a device object with the same
* address already exists.
* 1) adapter is enabling: Paired devices reported by stack.
* 2) adapter is discovering: Discovered devices during discovery operation.
* 3) adapter paired with a device: The paired device reported by stack.
* Note devices with identical address won't be appended.
*
* Devices will be removed when
* 1) Starting discovery: All unpaired devices will be removed before this
* adapter starts a new discovery.
* 2) Disabling BT: All devices will be removed.
* 1) adapter is disabling: All devices will be removed.
* 2) adapter starts discovery: All unpaired devices will be removed before
* this new discovery starts.
* 3) adapter unpaired with a device: The unpaired device will be removed.
*/
nsTArray<nsRefPtr<BluetoothDevice> > mDevices;
};