mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1187230: Convert Bluetooth to use daemon runnables, r=shuang 

With this patch, Bluetooth uses the generic daemon runnables.
This commit is contained in:
Thomas Zimmermann 2015-07-24 14:50:06 +02:00
Родитель f64a6dcafc
Коммит 1c60aeafa6
11 изменённых файлов: 201 добавлений и 202 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.cpp
Просмотреть файл

@ -481,7 +481,7 @@ void
BluetoothDaemonA2dpInterface::DispatchError( BluetoothDaemonA2dpInterface::DispatchError(
BluetoothA2dpResultHandler* aRes, BluetoothStatus aStatus) BluetoothA2dpResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothA2dpResultHandler, void, DaemonResultRunnable1<BluetoothA2dpResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothA2dpResultHandler::OnError, aRes, &BluetoothA2dpResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));

28
dom/bluetooth/bluedroid/BluetoothDaemonA2dpInterface.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "BluetoothDaemonHelpers.h" #include "BluetoothDaemonHelpers.h"
#include "BluetoothInterface.h" #include "BluetoothInterface.h"
#include "BluetoothInterfaceHelpers.h" #include "BluetoothInterfaceHelpers.h"
#include "mozilla/ipc/DaemonRunnables.h"
BEGIN_BLUETOOTH_NAMESPACE BEGIN_BLUETOOTH_NAMESPACE
@ -62,11 +63,12 @@ protected:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothA2dpResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothA2dpResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothA2dpResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothA2dpResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
void ErrorRsp(const DaemonSocketPDUHeader& aHeader, void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
@ -91,22 +93,18 @@ protected:
class NotificationHandlerWrapper; class NotificationHandlerWrapper;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothA2dpConnectionState, NotificationHandlerWrapper, void, BluetoothA2dpConnectionState, nsString,
nsString, BluetoothA2dpConnectionState, const nsAString&>
BluetoothA2dpConnectionState,
const nsAString&>
ConnectionStateNotification; ConnectionStateNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothA2dpAudioState, NotificationHandlerWrapper, void, BluetoothA2dpAudioState, nsString,
nsString, BluetoothA2dpAudioState, const nsAString&>
BluetoothA2dpAudioState,
const nsAString&>
AudioStateNotification; AudioStateNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
nsString, uint32_t, uint8_t, NotificationHandlerWrapper, void, nsString, uint32_t, uint8_t,
const nsAString&, uint32_t, uint8_t> const nsAString&, uint32_t, uint8_t>
AudioConfigNotification; AudioConfigNotification;

2
dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.cpp
Просмотреть файл

@ -1090,7 +1090,7 @@ void
BluetoothDaemonAvrcpInterface::DispatchError( BluetoothDaemonAvrcpInterface::DispatchError(
BluetoothAvrcpResultHandler* aRes, BluetoothStatus aStatus) BluetoothAvrcpResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothAvrcpResultHandler, void, DaemonResultRunnable1<BluetoothAvrcpResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothAvrcpResultHandler::OnError, aRes, &BluetoothAvrcpResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));

60
dom/bluetooth/bluedroid/BluetoothDaemonAvrcpInterface.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "BluetoothDaemonHelpers.h" #include "BluetoothDaemonHelpers.h"
#include "BluetoothInterface.h" #include "BluetoothInterface.h"
#include "BluetoothInterfaceHelpers.h" #include "BluetoothInterfaceHelpers.h"
#include "mozilla/ipc/DaemonRunnables.h"
BEGIN_BLUETOOTH_NAMESPACE BEGIN_BLUETOOTH_NAMESPACE
@ -126,11 +127,12 @@ protected:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothAvrcpResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothAvrcpResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothAvrcpResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothAvrcpResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
void ErrorRsp(const DaemonSocketPDUHeader& aHeader, void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
@ -187,57 +189,61 @@ protected:
class NotificationHandlerWrapper; class NotificationHandlerWrapper;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
nsString, unsigned long, NotificationHandlerWrapper, void, nsString, unsigned long,
const nsAString&> const nsAString&>
RemoteFeatureNotification; RemoteFeatureNotification;
typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void> typedef mozilla::ipc::DaemonNotificationRunnable0<
NotificationHandlerWrapper, void>
GetPlayStatusNotification; GetPlayStatusNotification;
typedef BluetoothNotificationRunnable0<NotificationHandlerWrapper, void> typedef mozilla::ipc::DaemonNotificationRunnable0<
NotificationHandlerWrapper, void>
ListPlayerAppAttrNotification; ListPlayerAppAttrNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
BluetoothAvrcpPlayerAttribute> NotificationHandlerWrapper, void, BluetoothAvrcpPlayerAttribute>
ListPlayerAppValuesNotification; ListPlayerAppValuesNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
uint8_t, nsAutoArrayPtr<BluetoothAvrcpPlayerAttribute>, NotificationHandlerWrapper, void, uint8_t,
nsAutoArrayPtr<BluetoothAvrcpPlayerAttribute>,
uint8_t, const BluetoothAvrcpPlayerAttribute*> uint8_t, const BluetoothAvrcpPlayerAttribute*>
GetPlayerAppValueNotification; GetPlayerAppValueNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
uint8_t, nsAutoArrayPtr<BluetoothAvrcpPlayerAttribute>, NotificationHandlerWrapper, void, uint8_t,
nsAutoArrayPtr<BluetoothAvrcpPlayerAttribute>,
uint8_t, const BluetoothAvrcpPlayerAttribute*> uint8_t, const BluetoothAvrcpPlayerAttribute*>
GetPlayerAppAttrsTextNotification; GetPlayerAppAttrsTextNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
uint8_t, uint8_t, NotificationHandlerWrapper, void, uint8_t, uint8_t,
nsAutoArrayPtr<uint8_t>, uint8_t, nsAutoArrayPtr<uint8_t>, uint8_t, uint8_t, const uint8_t*>
uint8_t, const uint8_t*>
GetPlayerAppValuesTextNotification; GetPlayerAppValuesTextNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
BluetoothAvrcpPlayerSettings, NotificationHandlerWrapper, void, BluetoothAvrcpPlayerSettings,
const BluetoothAvrcpPlayerSettings&> const BluetoothAvrcpPlayerSettings&>
SetPlayerAppValueNotification; SetPlayerAppValueNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
uint8_t, nsAutoArrayPtr<BluetoothAvrcpMediaAttribute>, NotificationHandlerWrapper, void, uint8_t,
nsAutoArrayPtr<BluetoothAvrcpMediaAttribute>,
uint8_t, const BluetoothAvrcpMediaAttribute*> uint8_t, const BluetoothAvrcpMediaAttribute*>
GetElementAttrNotification; GetElementAttrNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothAvrcpEvent, uint32_t> NotificationHandlerWrapper, void, BluetoothAvrcpEvent, uint32_t>
RegisterNotificationNotification; RegisterNotificationNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
uint8_t, uint8_t> NotificationHandlerWrapper, void, uint8_t, uint8_t>
VolumeChangeNotification; VolumeChangeNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
int, int> NotificationHandlerWrapper, void, int, int>
PassthroughCmdNotification; PassthroughCmdNotification;
class GetElementAttrInitOp; class GetElementAttrInitOp;

6
dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.cpp
Просмотреть файл

@ -2964,7 +2964,7 @@ void
BluetoothDaemonGattClientInterface::DispatchError( BluetoothDaemonGattClientInterface::DispatchError(
BluetoothGattClientResultHandler* aRes, BluetoothStatus aStatus) BluetoothGattClientResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothGattClientResultHandler, void, DaemonResultRunnable1<BluetoothGattClientResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothGattResultHandler::OnError, aRes, &BluetoothGattResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));
@ -2986,7 +2986,7 @@ void
BluetoothDaemonGattServerInterface::DispatchError( BluetoothDaemonGattServerInterface::DispatchError(
BluetoothGattServerResultHandler* aRes, BluetoothStatus aStatus) BluetoothGattServerResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothGattServerResultHandler, void, DaemonResultRunnable1<BluetoothGattServerResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothGattResultHandler::OnError, aRes, &BluetoothGattResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));
@ -3008,7 +3008,7 @@ void
BluetoothDaemonGattInterface::DispatchError( BluetoothDaemonGattInterface::DispatchError(
BluetoothGattResultHandler* aRes, BluetoothStatus aStatus) BluetoothGattResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothGattResultHandler, void, DaemonResultRunnable1<BluetoothGattResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothGattResultHandler::OnError, aRes, &BluetoothGattResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));

79
dom/bluetooth/bluedroid/BluetoothDaemonGattInterface.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "BluetoothDaemonHelpers.h" #include "BluetoothDaemonHelpers.h"
#include "BluetoothInterface.h" #include "BluetoothInterface.h"
#include "BluetoothInterfaceHelpers.h" #include "BluetoothInterfaceHelpers.h"
#include "mozilla/ipc/DaemonRunnables.h"
BEGIN_BLUETOOTH_NAMESPACE BEGIN_BLUETOOTH_NAMESPACE
@ -313,21 +314,25 @@ protected:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothGattClientResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothGattClientResultHandler, void>
ClientResultRunnable; ClientResultRunnable;
typedef BluetoothResultRunnable1<BluetoothGattClientResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothGattClientResultHandler, void,
BluetoothTypeOfDevice, BluetoothTypeOfDevice> BluetoothTypeOfDevice, BluetoothTypeOfDevice>
ClientGetDeviceTypeResultRunnable; ClientGetDeviceTypeResultRunnable;
typedef BluetoothResultRunnable0<BluetoothGattServerResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothGattServerResultHandler, void>
ServerResultRunnable; ServerResultRunnable;
typedef BluetoothResultRunnable0<BluetoothGattResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothGattResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothGattResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothGattResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
void ErrorRsp(const DaemonSocketPDUHeader& aHeader, void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
@ -488,42 +493,42 @@ protected:
class ClientNotificationHandlerWrapper; class ClientNotificationHandlerWrapper;
class ServerNotificationHandlerWrapper; class ServerNotificationHandlerWrapper;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
BluetoothGattStatus, int, BluetoothUuid, BluetoothGattStatus, int, BluetoothUuid,
BluetoothGattStatus, int, const BluetoothUuid&> BluetoothGattStatus, int, const BluetoothUuid&>
ClientRegisterNotification; ClientRegisterNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
nsString, int, BluetoothGattAdvData, nsString, int, BluetoothGattAdvData,
const nsAString&, int, const BluetoothGattAdvData&> const nsAString&, int, const BluetoothGattAdvData&>
ClientScanResultNotification; ClientScanResultNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, int, nsString, int, BluetoothGattStatus, int, nsString,
int, BluetoothGattStatus, int, const nsAString&> int, BluetoothGattStatus, int, const nsAString&>
ClientConnectNotification; ClientConnectNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, int, nsString, int, BluetoothGattStatus, int, nsString,
int, BluetoothGattStatus, int, const nsAString&> int, BluetoothGattStatus, int, const nsAString&>
ClientDisconnectNotification; ClientDisconnectNotification;
typedef BluetoothNotificationRunnable2< typedef mozilla::ipc::DaemonNotificationRunnable2<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus> int, BluetoothGattStatus>
ClientSearchCompleteNotification; ClientSearchCompleteNotification;
typedef BluetoothNotificationRunnable2< typedef mozilla::ipc::DaemonNotificationRunnable2<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattServiceId, int, BluetoothGattServiceId,
int, const BluetoothGattServiceId&> int, const BluetoothGattServiceId&>
ClientSearchResultNotification; ClientSearchResultNotification;
typedef BluetoothNotificationRunnable5< typedef mozilla::ipc::DaemonNotificationRunnable5<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattServiceId, int, BluetoothGattStatus, BluetoothGattServiceId,
BluetoothGattId, BluetoothGattCharProp, BluetoothGattId, BluetoothGattCharProp,
@ -531,7 +536,7 @@ protected:
const BluetoothGattId&, const BluetoothGattCharProp&> const BluetoothGattId&, const BluetoothGattCharProp&>
ClientGetCharacteristicNotification; ClientGetCharacteristicNotification;
typedef BluetoothNotificationRunnable5< typedef mozilla::ipc::DaemonNotificationRunnable5<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattServiceId, int, BluetoothGattStatus, BluetoothGattServiceId,
BluetoothGattId, BluetoothGattId, BluetoothGattId, BluetoothGattId,
@ -539,14 +544,14 @@ protected:
const BluetoothGattId&, const BluetoothGattId&> const BluetoothGattId&, const BluetoothGattId&>
ClientGetDescriptorNotification; ClientGetDescriptorNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattServiceId, BluetoothGattServiceId, int, BluetoothGattStatus, BluetoothGattServiceId, BluetoothGattServiceId,
int, BluetoothGattStatus, const BluetoothGattServiceId&, int, BluetoothGattStatus, const BluetoothGattServiceId&,
const BluetoothGattServiceId&> const BluetoothGattServiceId&>
ClientGetIncludedServiceNotification; ClientGetIncludedServiceNotification;
typedef BluetoothNotificationRunnable5< typedef mozilla::ipc::DaemonNotificationRunnable5<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, int, BluetoothGattStatus, int, int, BluetoothGattStatus,
BluetoothGattServiceId, BluetoothGattId, BluetoothGattServiceId, BluetoothGattId,
@ -554,121 +559,121 @@ protected:
const BluetoothGattServiceId&, const BluetoothGattId&> const BluetoothGattServiceId&, const BluetoothGattId&>
ClientRegisterNotificationNotification; ClientRegisterNotificationNotification;
typedef BluetoothNotificationRunnable2< typedef mozilla::ipc::DaemonNotificationRunnable2<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattNotifyParam, int, BluetoothGattNotifyParam,
int, const BluetoothGattNotifyParam&> int, const BluetoothGattNotifyParam&>
ClientNotifyNotification; ClientNotifyNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattReadParam, int, BluetoothGattStatus, BluetoothGattReadParam,
int, BluetoothGattStatus, const BluetoothGattReadParam&> int, BluetoothGattStatus, const BluetoothGattReadParam&>
ClientReadCharacteristicNotification; ClientReadCharacteristicNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattWriteParam, int, BluetoothGattStatus, BluetoothGattWriteParam,
int, BluetoothGattStatus, const BluetoothGattWriteParam&> int, BluetoothGattStatus, const BluetoothGattWriteParam&>
ClientWriteCharacteristicNotification; ClientWriteCharacteristicNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattReadParam, int, BluetoothGattStatus, BluetoothGattReadParam,
int, BluetoothGattStatus, const BluetoothGattReadParam&> int, BluetoothGattStatus, const BluetoothGattReadParam&>
ClientReadDescriptorNotification; ClientReadDescriptorNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus, BluetoothGattWriteParam, int, BluetoothGattStatus, BluetoothGattWriteParam,
int, BluetoothGattStatus, const BluetoothGattWriteParam&> int, BluetoothGattStatus, const BluetoothGattWriteParam&>
ClientWriteDescriptorNotification; ClientWriteDescriptorNotification;
typedef BluetoothNotificationRunnable2< typedef mozilla::ipc::DaemonNotificationRunnable2<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, BluetoothGattStatus> int, BluetoothGattStatus>
ClientExecuteWriteNotification; ClientExecuteWriteNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
int, nsString, int, BluetoothGattStatus, int, nsString, int, BluetoothGattStatus,
int, const nsAString&, int, BluetoothGattStatus> int, const nsAString&, int, BluetoothGattStatus>
ClientReadRemoteRssiNotification; ClientReadRemoteRssiNotification;
typedef BluetoothNotificationRunnable2< typedef mozilla::ipc::DaemonNotificationRunnable2<
ClientNotificationHandlerWrapper, void, ClientNotificationHandlerWrapper, void,
BluetoothGattStatus, int> BluetoothGattStatus, int>
ClientListenNotification; ClientListenNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, BluetoothUuid, BluetoothGattStatus, int, BluetoothUuid,
BluetoothGattStatus, int, const BluetoothUuid&> BluetoothGattStatus, int, const BluetoothUuid&>
ServerRegisterNotification; ServerRegisterNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
int, int, bool, nsString, int, int, bool, nsString,
int, int, bool, const nsAString&> int, int, bool, const nsAString&>
ServerConnectionNotification; ServerConnectionNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, BluetoothGattServiceId, int, BluetoothGattStatus, int, BluetoothGattServiceId, int,
BluetoothGattStatus, int, const BluetoothGattServiceId&, int> BluetoothGattStatus, int, const BluetoothGattServiceId&, int>
ServerServiceAddedNotification; ServerServiceAddedNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, int, int> BluetoothGattStatus, int, int, int>
ServerIncludedServiceAddedNotification; ServerIncludedServiceAddedNotification;
typedef BluetoothNotificationRunnable5< typedef mozilla::ipc::DaemonNotificationRunnable5<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, BluetoothUuid, int, int, BluetoothGattStatus, int, BluetoothUuid, int, int,
BluetoothGattStatus, int, const BluetoothUuid&, int, int> BluetoothGattStatus, int, const BluetoothUuid&, int, int>
ServerCharacteristicAddedNotification; ServerCharacteristicAddedNotification;
typedef BluetoothNotificationRunnable5< typedef mozilla::ipc::DaemonNotificationRunnable5<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, BluetoothUuid, int, int, BluetoothGattStatus, int, BluetoothUuid, int, int,
BluetoothGattStatus, int, const BluetoothUuid&, int, int> BluetoothGattStatus, int, const BluetoothUuid&, int, int>
ServerDescriptorAddedNotification; ServerDescriptorAddedNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, int> BluetoothGattStatus, int, int>
ServerServiceStartedNotification; ServerServiceStartedNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, int> BluetoothGattStatus, int, int>
ServerServiceStoppedNotification; ServerServiceStoppedNotification;
typedef BluetoothNotificationRunnable3< typedef mozilla::ipc::DaemonNotificationRunnable3<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int, int> BluetoothGattStatus, int, int>
ServerServiceDeletedNotification; ServerServiceDeletedNotification;
typedef BluetoothNotificationRunnable6< typedef mozilla::ipc::DaemonNotificationRunnable6<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
int, int, nsString, int, int, bool, int, int, nsString, int, int, bool,
int, int, const nsAString&, int, int, bool> int, int, const nsAString&, int, int, bool>
ServerRequestReadNotification; ServerRequestReadNotification;
typedef BluetoothNotificationRunnable9< typedef mozilla::ipc::DaemonNotificationRunnable9<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
int, int, nsString, int, int, int, nsAutoArrayPtr<uint8_t>, bool, bool, int, int, nsString, int, int, int, nsAutoArrayPtr<uint8_t>, bool, bool,
int, int, const nsAString&, int, int, int, const uint8_t*, bool, bool> int, int, const nsAString&, int, int, int, const uint8_t*, bool, bool>
ServerRequestWriteNotification; ServerRequestWriteNotification;
typedef BluetoothNotificationRunnable4< typedef mozilla::ipc::DaemonNotificationRunnable4<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
int, int, nsString, bool, int, int, nsString, bool,
int, int, const nsAString&, bool> int, int, const nsAString&, bool>
ServerRequestExecuteWriteNotification; ServerRequestExecuteWriteNotification;
typedef BluetoothNotificationRunnable2< typedef mozilla::ipc::DaemonNotificationRunnable2<
ServerNotificationHandlerWrapper, void, ServerNotificationHandlerWrapper, void,
BluetoothGattStatus, int> BluetoothGattStatus, int>
ServerResponseConfirmationNotification; ServerResponseConfirmationNotification;

2
dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.cpp
Просмотреть файл

@ -1799,7 +1799,7 @@ void
BluetoothDaemonHandsfreeInterface::DispatchError( BluetoothDaemonHandsfreeInterface::DispatchError(
BluetoothHandsfreeResultHandler* aRes, BluetoothStatus aStatus) BluetoothHandsfreeResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothHandsfreeResultHandler, void, DaemonResultRunnable1<BluetoothHandsfreeResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothHandsfreeResultHandler::OnError, aRes, &BluetoothHandsfreeResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));

96
dom/bluetooth/bluedroid/BluetoothDaemonHandsfreeInterface.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "BluetoothDaemonHelpers.h" #include "BluetoothDaemonHelpers.h"
#include "BluetoothInterface.h" #include "BluetoothInterface.h"
#include "BluetoothInterfaceHelpers.h" #include "BluetoothInterfaceHelpers.h"
#include "mozilla/ipc/DaemonRunnables.h"
BEGIN_BLUETOOTH_NAMESPACE BEGIN_BLUETOOTH_NAMESPACE
@ -135,11 +136,12 @@ protected:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothHandsfreeResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothHandsfreeResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothHandsfreeResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothHandsfreeResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
void ErrorRsp(const DaemonSocketPDUHeader& aHeader, void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
@ -216,88 +218,76 @@ protected:
class NotificationHandlerWrapper; class NotificationHandlerWrapper;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothHandsfreeConnectionState, NotificationHandlerWrapper, void, BluetoothHandsfreeConnectionState,
nsString, nsString, BluetoothHandsfreeConnectionState, const nsAString&>
BluetoothHandsfreeConnectionState,
const nsAString&>
ConnectionStateNotification; ConnectionStateNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothHandsfreeAudioState, NotificationHandlerWrapper, void, BluetoothHandsfreeAudioState,
nsString, nsString, BluetoothHandsfreeAudioState, const nsAString&>
BluetoothHandsfreeAudioState,
const nsAString&>
AudioStateNotification; AudioStateNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothHandsfreeVoiceRecognitionState, nsString, NotificationHandlerWrapper, void, BluetoothHandsfreeVoiceRecognitionState,
BluetoothHandsfreeVoiceRecognitionState, const nsAString&> nsString, BluetoothHandsfreeVoiceRecognitionState, const nsAString&>
VoiceRecognitionNotification; VoiceRecognitionNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
AnswerCallNotification; AnswerCallNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
HangupCallNotification; HangupCallNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
BluetoothHandsfreeVolumeType, int, nsString, NotificationHandlerWrapper, void, BluetoothHandsfreeVolumeType,
BluetoothHandsfreeVolumeType, int, const nsAString&> int, nsString, BluetoothHandsfreeVolumeType, int, const nsAString&>
VolumeNotification; VolumeNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
nsString, nsString, NotificationHandlerWrapper, void, nsString, nsString, const nsAString&,
const nsAString&, const nsAString&> const nsAString&>
DialCallNotification; DialCallNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
char, nsString, NotificationHandlerWrapper, void, char, nsString, char, const nsAString&>
char, const nsAString&>
DtmfNotification; DtmfNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothHandsfreeNRECState, nsString, NotificationHandlerWrapper, void, BluetoothHandsfreeNRECState, nsString,
BluetoothHandsfreeNRECState, const nsAString&> BluetoothHandsfreeNRECState, const nsAString&>
NRECNotification; NRECNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothHandsfreeCallHoldType, nsString, NotificationHandlerWrapper, void, BluetoothHandsfreeCallHoldType,
BluetoothHandsfreeCallHoldType, const nsAString&> nsString, BluetoothHandsfreeCallHoldType, const nsAString&>
CallHoldNotification; CallHoldNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
CnumNotification; CnumNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
CindNotification; CindNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
CopsNotification; CopsNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
ClccNotification; ClccNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
nsCString, nsString, NotificationHandlerWrapper, void, nsCString, nsString,
const nsACString&, const nsAString&> const nsACString&, const nsAString&>
UnknownAtNotification; UnknownAtNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
nsString, NotificationHandlerWrapper, void, nsString, const nsAString&>
const nsAString&>
KeyPressedNotification; KeyPressedNotification;
class ConnectionStateInitOp; class ConnectionStateInitOp;

74
dom/bluetooth/bluedroid/BluetoothDaemonInterface.cpp
Просмотреть файл

@ -17,6 +17,7 @@
#include "BluetoothDaemonSetupInterface.h" #include "BluetoothDaemonSetupInterface.h"
#include "BluetoothDaemonSocketInterface.h" #include "BluetoothDaemonSocketInterface.h"
#include "BluetoothInterfaceHelpers.h" #include "BluetoothInterfaceHelpers.h"
#include "mozilla/ipc/DaemonRunnables.h"
#include "mozilla/ipc/DaemonSocket.h" #include "mozilla/ipc/DaemonSocket.h"
#include "mozilla/ipc/ListenSocket.h" #include "mozilla/ipc/ListenSocket.h"
#include "mozilla/unused.h" #include "mozilla/unused.h"
@ -147,11 +148,12 @@ private:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothSetupResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothSetupResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothSetupResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothSetupResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
void void
@ -619,11 +621,12 @@ private:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
void ErrorRsp(const DaemonSocketPDUHeader& aHeader, void ErrorRsp(const DaemonSocketPDUHeader& aHeader,
@ -881,63 +884,58 @@ private:
} }
}; };
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
bool> NotificationHandlerWrapper, void, bool>
AdapterStateChangedNotification; AdapterStateChangedNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
BluetoothStatus, int, NotificationHandlerWrapper, void, BluetoothStatus, int,
nsAutoArrayPtr<BluetoothProperty>, nsAutoArrayPtr<BluetoothProperty>, BluetoothStatus, int,
BluetoothStatus, int,
const BluetoothProperty*> const BluetoothProperty*>
AdapterPropertiesNotification; AdapterPropertiesNotification;
typedef BluetoothNotificationRunnable4<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable4<
BluetoothStatus, nsString, int, NotificationHandlerWrapper, void, BluetoothStatus, nsString, int,
nsAutoArrayPtr<BluetoothProperty>, nsAutoArrayPtr<BluetoothProperty>, BluetoothStatus, const nsAString&,
BluetoothStatus, const nsAString&,
int, const BluetoothProperty*> int, const BluetoothProperty*>
RemoteDevicePropertiesNotification; RemoteDevicePropertiesNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
int, NotificationHandlerWrapper, void, int, nsAutoArrayPtr<BluetoothProperty>,
nsAutoArrayPtr<BluetoothProperty>,
int, const BluetoothProperty*> int, const BluetoothProperty*>
DeviceFoundNotification; DeviceFoundNotification;
typedef BluetoothNotificationRunnable1<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable1<
bool> NotificationHandlerWrapper, void, bool>
DiscoveryStateChangedNotification; DiscoveryStateChangedNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
nsString, nsString, uint32_t, NotificationHandlerWrapper, void, nsString, nsString, uint32_t,
const nsAString&, const nsAString&> const nsAString&, const nsAString&>
PinRequestNotification; PinRequestNotification;
typedef BluetoothNotificationRunnable5<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable5<
nsString, nsString, uint32_t, NotificationHandlerWrapper, void, nsString, nsString, uint32_t,
BluetoothSspVariant, uint32_t, BluetoothSspVariant, uint32_t, const nsAString&, const nsAString&>
const nsAString&, const nsAString&>
SspRequestNotification; SspRequestNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
BluetoothStatus, nsString, NotificationHandlerWrapper, void, BluetoothStatus, nsString,
BluetoothBondState, BluetoothBondState, BluetoothStatus, const nsAString&>
BluetoothStatus, const nsAString&>
BondStateChangedNotification; BondStateChangedNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
BluetoothStatus, nsString, bool, NotificationHandlerWrapper, void, BluetoothStatus, nsString, bool,
BluetoothStatus, const nsAString&> BluetoothStatus, const nsAString&>
AclStateChangedNotification; AclStateChangedNotification;
typedef BluetoothNotificationRunnable3<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable3<
uint16_t, nsAutoArrayPtr<uint8_t>, NotificationHandlerWrapper, void, uint16_t, nsAutoArrayPtr<uint8_t>,
uint8_t, uint16_t, const uint8_t*> uint8_t, uint16_t, const uint8_t*>
DutModeRecvNotification; DutModeRecvNotification;
typedef BluetoothNotificationRunnable2<NotificationHandlerWrapper, void, typedef mozilla::ipc::DaemonNotificationRunnable2<
BluetoothStatus, uint16_t> NotificationHandlerWrapper, void, BluetoothStatus, uint16_t>
LeTestModeNotification; LeTestModeNotification;
void AdapterStateChangedNtf(const DaemonSocketPDUHeader& aHeader, void AdapterStateChangedNtf(const DaemonSocketPDUHeader& aHeader,
@ -2241,7 +2239,7 @@ void
BluetoothDaemonInterface::DispatchError(BluetoothResultHandler* aRes, BluetoothDaemonInterface::DispatchError(BluetoothResultHandler* aRes,
BluetoothStatus aStatus) BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1< DaemonResultRunnable1<
BluetoothResultHandler, void, BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothResultHandler, void, BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothResultHandler::OnError, aRes, &BluetoothResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));

2
dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.cpp
Просмотреть файл

@ -366,7 +366,7 @@ void
BluetoothDaemonSocketInterface::DispatchError( BluetoothDaemonSocketInterface::DispatchError(
BluetoothSocketResultHandler* aRes, BluetoothStatus aStatus) BluetoothSocketResultHandler* aRes, BluetoothStatus aStatus)
{ {
BluetoothResultRunnable1<BluetoothSocketResultHandler, void, DaemonResultRunnable1<BluetoothSocketResultHandler, void,
BluetoothStatus, BluetoothStatus>::Dispatch( BluetoothStatus, BluetoothStatus>::Dispatch(
aRes, &BluetoothSocketResultHandler::OnError, aRes, &BluetoothSocketResultHandler::OnError,
ConstantInitOp1<BluetoothStatus>(aStatus)); ConstantInitOp1<BluetoothStatus>(aStatus));

18
dom/bluetooth/bluedroid/BluetoothDaemonSocketInterface.h
Просмотреть файл

@ -10,6 +10,7 @@
#include "BluetoothDaemonHelpers.h" #include "BluetoothDaemonHelpers.h"
#include "BluetoothInterface.h" #include "BluetoothInterface.h"
#include "BluetoothInterfaceHelpers.h" #include "BluetoothInterfaceHelpers.h"
#include "mozilla/ipc/DaemonRunnables.h"
BEGIN_BLUETOOTH_NAMESPACE BEGIN_BLUETOOTH_NAMESPACE
@ -58,20 +59,21 @@ private:
// Responses // Responses
// //
typedef BluetoothResultRunnable0<BluetoothSocketResultHandler, void> typedef mozilla::ipc::DaemonResultRunnable0<
BluetoothSocketResultHandler, void>
ResultRunnable; ResultRunnable;
typedef BluetoothResultRunnable1<BluetoothSocketResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
int, int> BluetoothSocketResultHandler, void, int, int>
IntResultRunnable; IntResultRunnable;
typedef BluetoothResultRunnable1<BluetoothSocketResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable1<
BluetoothStatus, BluetoothStatus> BluetoothSocketResultHandler, void, BluetoothStatus, BluetoothStatus>
ErrorRunnable; ErrorRunnable;
typedef BluetoothResultRunnable3<BluetoothSocketResultHandler, void, typedef mozilla::ipc::DaemonResultRunnable3<
int, nsString, int, BluetoothSocketResultHandler, void, int, nsString, int, int,
int, const nsAString_internal&, int> const nsAString_internal&, int>
IntStringIntResultRunnable; IntStringIntResultRunnable;
void ErrorRsp(const DaemonSocketPDUHeader& aHeader, void ErrorRsp(const DaemonSocketPDUHeader& aHeader,