Bug 1176898 - Remove redundant DisconnectFromOwner of BluetoothDiscov…

…eryHandle. r=btian --HG-- extra : rebase_source : 3275e369491f07e67d0678d8655c4fcd8f65dca4
dothq · Jul 21, 2015 · 4eac95e · 4eac95e
1 parent 51fb1c0
commit 4eac95e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp b/dom/bluetooth/bluetooth2/BluetoothAdapter.cpp
@@ -509,11 +509,6 @@ void
 BluetoothAdapter::SetDiscoveryHandleInUse(
   BluetoothDiscoveryHandle* aDiscoveryHandle)
 {
-  // Stop discovery handle in use from listening to "DeviceFound" signal
-  if (mDiscoveryHandleInUse) {
-    mDiscoveryHandleInUse->DisconnectFromOwner();
-  }
-
   mDiscoveryHandleInUse = aDiscoveryHandle;
 }
 

diff --git a/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.cpp b/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.cpp
@@ -43,12 +43,6 @@ BluetoothDiscoveryHandle::~BluetoothDiscoveryHandle()
 {
 }
 
-void
-BluetoothDiscoveryHandle::DisconnectFromOwner()
-{
-  DOMEventTargetHelper::DisconnectFromOwner();
-}
-
 // static
 already_AddRefed<BluetoothDiscoveryHandle>
 BluetoothDiscoveryHandle::Create(nsPIDOMWindow* aWindow)

diff --git a/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h b/dom/bluetooth/bluetooth2/BluetoothDiscoveryHandle.h
@@ -47,8 +47,6 @@ class BluetoothDiscoveryHandle final : public DOMEventTargetHelper
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aGivenProto) override;
 
-  virtual void DisconnectFromOwner() override;
-
 private:
   BluetoothDiscoveryHandle(nsPIDOMWindow* aWindow);