From f15f8516e49ebb6e8f6c479e9ba4950f2cdf5b67 Mon Sep 17 00:00:00 2001
From: Chris Pearce <cpearce@mozilla.com>
Date: Fri, 17 Aug 2012 16:22:25 +1200
Subject: [PATCH] Bug 778640 - Backout due to burning. r=bustage

---
 dom/bluetooth/BluetoothAdapter.cpp            | 15 -------------
 dom/bluetooth/Makefile.in                     |  1 -
 .../nsIDOMBluetoothDeviceAddressEvent.idl     | 21 -------------------
 js/xpconnect/src/event_impl_gen.conf.in       |  3 +--
 4 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl

diff --git a/dom/bluetooth/BluetoothAdapter.cpp b/dom/bluetooth/BluetoothAdapter.cpp
index 5f33a587490f..545055c2f6dd 100644
--- a/dom/bluetooth/BluetoothAdapter.cpp
+++ b/dom/bluetooth/BluetoothAdapter.cpp
@@ -14,13 +14,11 @@
 #include "BluetoothReplyRunnable.h"
 #include "BluetoothUtils.h"
 
-#include "GeneratedEvents.h"
 #include "nsDOMClassInfo.h"
 #include "nsDOMEvent.h"
 #include "nsThreadUtils.h"
 #include "nsXPCOMCIDInternal.h"
 #include "nsIDOMDOMRequest.h"
-#include "nsIDOMBluetoothDeviceAddressEvent.h"
 #include "nsContentUtils.h"
 
 #include "mozilla/LazyIdleThread.h"
@@ -274,19 +272,6 @@ BluetoothAdapter::Notify(const BluetoothSignal& aData)
     nsRefPtr<BluetoothDevice> d = BluetoothDevice::Create(GetOwner(), mPath, aData.value());
     nsRefPtr<BluetoothDeviceEvent> e = BluetoothDeviceEvent::Create(d);
     e->Dispatch(ToIDOMEventTarget(), NS_LITERAL_STRING("devicefound"));
-  } else if (aData.name().EqualsLiteral("DeviceDisappeared")) {
-    const nsAString& deviceAddress = aData.value().get_nsString();
-
-    nsCOMPtr<nsIDOMEvent> event;
-    NS_NewDOMBluetoothDeviceAddressEvent(getter_AddRefs(event), nullptr, nullptr);
-
-    nsCOMPtr<nsIDOMBluetoothDeviceAddressEvent> e = do_QueryInterface(event);
-    e->InitBluetoothDeviceAddressEvent(NS_LITERAL_STRING("devicedisappeared"),
-                                       false, false, deviceAddress);
-    e->SetTrusted(true);
-
-    bool dummy;
-    DispatchEvent(event, &dummy);
   } else if (aData.name().EqualsLiteral("PropertyChanged")) {
     // Get BluetoothNamedValue, make sure array length is 1
     InfallibleTArray<BluetoothNamedValue> arr = aData.value().get_ArrayOfBluetoothNamedValue();
diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in
index e5659abd7980..097a79cf8c25 100644
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -45,7 +45,6 @@ XPIDLSRCS = \
   nsIDOMBluetoothAdapter.idl \
   nsIDOMBluetoothDevice.idl \
   nsIDOMBluetoothDeviceEvent.idl \
-  nsIDOMBluetoothDeviceAddressEvent.idl \
   nsIDOMBluetoothPropertyEvent.idl \
   $(NULL)
 
diff --git a/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl b/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl
deleted file mode 100644
index f89783e4f3ed..000000000000
--- a/dom/bluetooth/nsIDOMBluetoothDeviceAddressEvent.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMEvent.idl"
-
-[scriptable, builtinclass, uuid(afcb832f-bbb5-45fa-b703-f8185bd2d26d)]
-interface nsIDOMBluetoothDeviceAddressEvent : nsIDOMEvent
-{
-  readonly attribute DOMString  deviceAddress;
-
-  [noscript] void initBluetoothDeviceAddressEvent(in DOMString aType,
-                                                  in boolean aCanBubble,
-                                                  in boolean aCancelable,
-                                                  in DOMString aDeviceAddress);
-};
-
-dictionary BluetoothDeviceAddressEventInit : EventInit
-{
-  DOMString  deviceAddress;
-};
diff --git a/js/xpconnect/src/event_impl_gen.conf.in b/js/xpconnect/src/event_impl_gen.conf.in
index 54d706483145..72ea8454445d 100644
--- a/js/xpconnect/src/event_impl_gen.conf.in
+++ b/js/xpconnect/src/event_impl_gen.conf.in
@@ -21,8 +21,7 @@ simple_events = [
     'DeviceOrientationEvent',
     'DeviceLightEvent',
     'MozApplicationEvent',
-    'DeviceStorageChangeEvent',
-    'BluetoothDeviceAddressEvent'
+    'DeviceStorageChangeEvent'
   ]
 
 """ include file names """