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

Bug 1156352: Remove |UnixSocketRawData| from Bluetooth interfaces, r=btian

This commit is contained in:
Thomas Zimmermann 2015-04-23 13:48:47 +02:00
Родитель ab71ff982e
Коммит bbd18cd078
9 изменённых файлов: 29 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
dom/bluetooth/BluetoothSocketObserver.h
Просмотреть файл

@ -19,7 +19,7 @@ class BluetoothSocketObserver
public:
virtual void ReceiveSocketData(
BluetoothSocket* aSocket,
nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) = 0;
nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aBuffer) = 0;
/**
* A callback function which would be called when a socket connection

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

@ -876,7 +876,7 @@ BluetoothOppManager::ValidateFileName()
}
bool
BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketRawData* aMessage)
BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketBuffer* aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aMessage);
@ -926,7 +926,7 @@ BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketRawData* aMessage)
}
void
BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage)
BluetoothOppManager::ServerDataHandler(UnixSocketBuffer* aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
@ -1053,7 +1053,7 @@ BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage)
}
void
BluetoothOppManager::ClientDataHandler(UnixSocketRawData* aMessage)
BluetoothOppManager::ClientDataHandler(UnixSocketBuffer* aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
@ -1165,12 +1165,12 @@ BluetoothOppManager::ClientDataHandler(UnixSocketRawData* aMessage)
// Virtual function of class SocketConsumer
void
BluetoothOppManager::ReceiveSocketData(BluetoothSocket* aSocket,
nsAutoPtr<UnixSocketRawData>& aMessage)
nsAutoPtr<UnixSocketBuffer>& aBuffer)
{
if (mIsServer) {
ServerDataHandler(aMessage);
ServerDataHandler(aBuffer);
} else {
ClientDataHandler(aMessage);
ClientDataHandler(aBuffer);
}
}

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

@ -48,8 +48,8 @@ public:
static const int MAX_PACKET_LENGTH = 0xFFFE;
static BluetoothOppManager* Get();
void ClientDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
void ServerDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
void ClientDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
void ServerDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
bool Listen();
@ -71,7 +71,7 @@ public:
// The following functions are inherited from BluetoothSocketObserver
void ReceiveSocketData(
BluetoothSocket* aSocket,
nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aMessage) override;
virtual void OnSocketConnectSuccess(BluetoothSocket* aSocket) override;
virtual void OnSocketConnectError(BluetoothSocket* aSocket) override;
virtual void OnSocketDisconnect(BluetoothSocket* aSocket) override;
@ -128,7 +128,7 @@ private:
* length.
*/
bool ComposePacket(uint8_t aOpCode,
mozilla::ipc::UnixSocketRawData* aMessage);
mozilla::ipc::UnixSocketBuffer* aMessage);
/**
* OBEX session status.

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

@ -676,7 +676,10 @@ BluetoothSocket::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(mObserver);
mObserver->ReceiveSocketData(this, aMessage);
nsAutoPtr<mozilla::ipc::UnixSocketBuffer> buffer(aMessage.forget());
mObserver->ReceiveSocketData(this, buffer);
}
void

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

@ -750,7 +750,7 @@ BluetoothHfpManager::ParseAtCommand(const nsACString& aAtCommand,
// Virtual function of class SocketConsumer
void
BluetoothHfpManager::ReceiveSocketData(BluetoothSocket* aSocket,
nsAutoPtr<UnixSocketRawData>& aMessage)
nsAutoPtr<UnixSocketBuffer>& aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aSocket);

2
dom/bluetooth/bluez/BluetoothHfpManager.h
Просмотреть файл

@ -90,7 +90,7 @@ public:
// The following functions are inherited from BluetoothSocketObserver
virtual void ReceiveSocketData(
BluetoothSocket* aSocket,
nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aMessage) override;
virtual void OnSocketConnectSuccess(BluetoothSocket* aSocket) override;
virtual void OnSocketConnectError(BluetoothSocket* aSocket) override;
virtual void OnSocketDisconnect(BluetoothSocket* aSocket) override;

8
dom/bluetooth/bluez/BluetoothOppManager.cpp
Просмотреть файл

@ -832,7 +832,7 @@ BluetoothOppManager::ValidateFileName()
}
bool
BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketRawData* aMessage)
BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketBuffer* aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(aMessage);
@ -881,7 +881,7 @@ BluetoothOppManager::ComposePacket(uint8_t aOpCode, UnixSocketRawData* aMessage)
}
void
BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage)
BluetoothOppManager::ServerDataHandler(UnixSocketBuffer* aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
@ -1008,7 +1008,7 @@ BluetoothOppManager::ServerDataHandler(UnixSocketRawData* aMessage)
}
void
BluetoothOppManager::ClientDataHandler(UnixSocketRawData* aMessage)
BluetoothOppManager::ClientDataHandler(UnixSocketBuffer* aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
@ -1120,7 +1120,7 @@ BluetoothOppManager::ClientDataHandler(UnixSocketRawData* aMessage)
// Virtual function of class SocketConsumer
void
BluetoothOppManager::ReceiveSocketData(BluetoothSocket* aSocket,
nsAutoPtr<UnixSocketRawData>& aMessage)
nsAutoPtr<UnixSocketBuffer>& aMessage)
{
if (mIsServer) {
ServerDataHandler(aMessage);

8
dom/bluetooth/bluez/BluetoothOppManager.h
Просмотреть файл

@ -44,8 +44,8 @@ public:
static const int MAX_PACKET_LENGTH = 0xFFFE;
static BluetoothOppManager* Get();
void ClientDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
void ServerDataHandler(mozilla::ipc::UnixSocketRawData* aMessage);
void ClientDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
void ServerDataHandler(mozilla::ipc::UnixSocketBuffer* aMessage);
bool Listen();
@ -67,7 +67,7 @@ public:
// The following functions are inherited from BluetoothSocketObserver
void ReceiveSocketData(
BluetoothSocket* aSocket,
nsAutoPtr<mozilla::ipc::UnixSocketRawData>& aMessage) override;
nsAutoPtr<mozilla::ipc::UnixSocketBuffer>& aMessage) override;
virtual void OnSocketConnectSuccess(BluetoothSocket* aSocket) override;
virtual void OnSocketConnectError(BluetoothSocket* aSocket) override;
virtual void OnSocketDisconnect(BluetoothSocket* aSocket) override;
@ -118,7 +118,7 @@ private:
* length.
*/
bool ComposePacket(uint8_t aOpCode,
mozilla::ipc::UnixSocketRawData* aMessage);
mozilla::ipc::UnixSocketBuffer* aMessage);
/**
* OBEX session status.

5
dom/bluetooth/bluez/BluetoothSocket.cpp
Просмотреть файл

@ -611,7 +611,10 @@ BluetoothSocket::ReceiveSocketData(nsAutoPtr<UnixSocketRawData>& aMessage)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(mObserver);
mObserver->ReceiveSocketData(this, aMessage);
nsAutoPtr<UnixSocketBuffer> buffer(aMessage.forget());
mObserver->ReceiveSocketData(this, buffer);
}
void