author | Eric Chou <echou@mozilla.com> |
Thu, 04 Apr 2013 17:55:34 -0700 | |
changeset 127746 | 26f388aeced914f847ec06858156fc20e7085960 |
parent 127745 | 1d5a3e86a843e9bcf3512364c9203420a3ed8ebc |
child 127747 | 1246e3291a04bd98739022ec0daf333e3233ed03 |
push id | 24512 |
push user | ryanvm@gmail.com |
push date | Fri, 05 Apr 2013 20:13:49 +0000 |
treeherder | mozilla-central@139b6ba547fa [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mrbkap |
bugs | 851046 |
milestone | 23.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/bluetooth/BluetoothService.h +++ b/dom/bluetooth/BluetoothService.h @@ -244,23 +244,16 @@ public: BlobParent* aBlobParent, BlobChild* aBlobChild, BluetoothReplyRunnable* aRunnable) = 0; virtual void StopSendingFile(const nsAString& aDeviceAddress, BluetoothReplyRunnable* aRunnable) = 0; - virtual nsresult - ListenSocketViaService(int aChannel, - BluetoothSocketType aType, - bool aAuth, - bool aEncrypt, - mozilla::ipc::UnixSocketConsumer* aConsumer) = 0; - virtual void ConfirmReceivingFile(const nsAString& aDeviceAddress, bool aConfirm, BluetoothReplyRunnable* aRunnable) = 0; bool IsEnabled() const { return mEnabled;
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp +++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.cpp @@ -207,29 +207,16 @@ BluetoothServiceChildProcess::GetSocketV bool aEncrypt, mozilla::ipc::UnixSocketConsumer* aConsumer, BluetoothReplyRunnable* aRunnable) { MOZ_NOT_REACHED("This should never be called!"); return NS_ERROR_FAILURE; } - -nsresult -BluetoothServiceChildProcess::ListenSocketViaService( - int aChannel, - BluetoothSocketType aType, - bool aAuth, - bool aEncrypt, - mozilla::ipc::UnixSocketConsumer* aConsumer) -{ - MOZ_NOT_REACHED("This should never be called!"); - return NS_ERROR_FAILURE; -} - bool BluetoothServiceChildProcess::SetPinCodeInternal( const nsAString& aDeviceAddress, const nsAString& aPinCode, BluetoothReplyRunnable* aRunnable) { SendRequest(aRunnable, SetPinCodeRequest(nsString(aDeviceAddress), nsString(aPinCode)));
--- a/dom/bluetooth/ipc/BluetoothServiceChildProcess.h +++ b/dom/bluetooth/ipc/BluetoothServiceChildProcess.h @@ -86,23 +86,16 @@ public: GetSocketViaService(const nsAString& aObjectPath, const nsAString& aService, BluetoothSocketType aType, bool aAuth, bool aEncrypt, mozilla::ipc::UnixSocketConsumer* aConsumer, BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE; - virtual nsresult - ListenSocketViaService(int aChannel, - BluetoothSocketType aType, - bool aAuth, - bool aEncrypt, - mozilla::ipc::UnixSocketConsumer* aConsumer) MOZ_OVERRIDE; - virtual bool SetPinCodeInternal(const nsAString& aDeviceAddress, const nsAString& aPinCode, BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE; virtual bool SetPasskeyInternal(const nsAString& aDeviceAddress, uint32_t aPasskey,
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp +++ b/dom/bluetooth/linux/BluetoothDBusService.cpp @@ -2788,27 +2788,8 @@ BluetoothDBusService::ConfirmReceivingFi if (!opp->ConfirmReceivingFile(aConfirm)) { errorStr.AssignLiteral("Calling ConfirmReceivingFile() failed"); } DispatchBluetoothReply(aRunnable, v, errorStr); } -nsresult -BluetoothDBusService::ListenSocketViaService( - int aChannel, - BluetoothSocketType aType, - bool aAuth, - bool aEncrypt, - mozilla::ipc::UnixSocketConsumer* aConsumer) -{ - NS_ASSERTION(NS_IsMainThread(), "Must be called from main thread!"); - - BluetoothUnixSocketConnector* c = - new BluetoothUnixSocketConnector(aType, aChannel, aAuth, aEncrypt); - if (!aConsumer->ListenSocket(c)) { - NS_WARNING("Can't listen on socket!"); - return NS_ERROR_FAILURE; - } - - return NS_OK; -}
--- a/dom/bluetooth/linux/BluetoothDBusService.h +++ b/dom/bluetooth/linux/BluetoothDBusService.h @@ -82,23 +82,16 @@ public: const nsAString& aService, BluetoothSocketType aType, bool aAuth, bool aEncrypt, mozilla::ipc::UnixSocketConsumer* aConsumer, BluetoothReplyRunnable* aRunnable); virtual nsresult - ListenSocketViaService(int aChannel, - BluetoothSocketType aType, - bool aAuth, - bool aEncrypt, - mozilla::ipc::UnixSocketConsumer* aConsumer); - - virtual nsresult CreatePairedDeviceInternal(const nsAString& aDeviceAddress, int aTimeout, BluetoothReplyRunnable* aRunnable); virtual nsresult RemoveDeviceInternal(const nsAString& aDeviceObjectPath, BluetoothReplyRunnable* aRunnable);