Fix merge bustage between changeset c8be375e0c41 (bug 988111) and changeset 8560fc7e2849 (bug 984269), merged (I think) in changeset 0ff6afce0133, on a CLOSED TREE.
authorL. David Baron <dbaron@dbaron.org>
Tue, 01 Apr 2014 15:10:06 -0700
changeset 176561 4941a2ac0786109b08856738019b016a6c5a66a6
parent 176559 0ff6afce0133cad913d1ffb453bcd35a4525698a
child 176562 b8f9af7bb3a39de29d95fbc78ff9e2cf2fe688a3
child 176659 0217e524f8b9a0a6924af0b65eccdf06438c4568
child 176682 0e358d5c2f75a591431522bbdedfadab38ff96f2
push id41778
push userkwierso@gmail.com
push dateTue, 01 Apr 2014 23:46:44 +0000
treeherdermozilla-inbound@b8f9af7bb3a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs988111, 984269
milestone31.0a1
first release with
nightly linux32
4941a2ac0786 / 31.0a1 / 20140402030201 / files
nightly linux64
4941a2ac0786 / 31.0a1 / 20140402030201 / files
nightly mac
4941a2ac0786 / 31.0a1 / 20140402030201 / files
nightly win32
4941a2ac0786 / 31.0a1 / 20140402030201 / files
nightly win64
4941a2ac0786 / 31.0a1 / 20140402030201 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Fix merge bustage between changeset c8be375e0c41 (bug 988111) and changeset 8560fc7e2849 (bug 984269), merged (I think) in changeset 0ff6afce0133, on a CLOSED TREE.
dom/bluetooth/BluetoothAdapter.cpp
dom/bluetooth/BluetoothDevice.cpp
dom/bluetooth/BluetoothManager.cpp
--- a/dom/bluetooth/BluetoothAdapter.cpp
+++ b/dom/bluetooth/BluetoothAdapter.cpp
@@ -191,17 +191,17 @@ BluetoothAdapter::~BluetoothAdapter()
   // We can be null on shutdown, where this might happen
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_ADAPTER), this);
 }
 
 void
 BluetoothAdapter::DisconnectFromOwner()
 {
-  nsDOMEventTargetHelper::DisconnectFromOwner();
+  DOMEventTargetHelper::DisconnectFromOwner();
 
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_ADAPTER), this);
 }
 
 void
 BluetoothAdapter::Unroot()
--- a/dom/bluetooth/BluetoothDevice.cpp
+++ b/dom/bluetooth/BluetoothDevice.cpp
@@ -75,17 +75,17 @@ BluetoothDevice::~BluetoothDevice()
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(mAddress, this);
   Unroot();
 }
 
 void
 BluetoothDevice::DisconnectFromOwner()
 {
-  nsDOMEventTargetHelper::DisconnectFromOwner();
+  DOMEventTargetHelper::DisconnectFromOwner();
 
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(mAddress, this);
 }
 
 void
 BluetoothDevice::Root()
--- a/dom/bluetooth/BluetoothManager.cpp
+++ b/dom/bluetooth/BluetoothManager.cpp
@@ -117,17 +117,17 @@ BluetoothManager::~BluetoothManager()
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_MANAGER), this);
 }
 
 void
 BluetoothManager::DisconnectFromOwner()
 {
-  nsDOMEventTargetHelper::DisconnectFromOwner();
+  DOMEventTargetHelper::DisconnectFromOwner();
 
   BluetoothService* bs = BluetoothService::Get();
   NS_ENSURE_TRUE_VOID(bs);
   bs->UnregisterBluetoothSignalHandler(NS_LITERAL_STRING(KEY_MANAGER), this);
 }
 
 void
 BluetoothManager::SetPropertyByValue(const BluetoothNamedValue& aValue)