From af9cda042a0c8a080690a58d3df2c8e1dddfa8f4 Mon Sep 17 00:00:00 2001 From: Blake Kaplan Date: Mon, 19 Nov 2012 15:35:54 -0800 Subject: [PATCH] Bug 812717 - Use the correct nsISupports pointer. r=dougt --HG-- extra : transplant_source : %1F%98%01c%CF%08%1F%AC%DA%DDr%07%1DM9%9E%FD%AD%14%18 --- dom/src/notification/nsDesktopNotification.cpp | 10 +--------- dom/src/notification/nsDesktopNotification.h | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dom/src/notification/nsDesktopNotification.cpp b/dom/src/notification/nsDesktopNotification.cpp index 053f52752c6f..11ede304a4bb 100644 --- a/dom/src/notification/nsDesktopNotification.cpp +++ b/dom/src/notification/nsDesktopNotification.cpp @@ -43,15 +43,7 @@ nsDOMDesktopNotification::PostDesktopNotification() DOMCI_DATA(DesktopNotification, nsDOMDesktopNotification) -NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMDesktopNotification) - -NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsDOMDesktopNotification, nsDOMEventTargetHelper) -NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END -NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDOMDesktopNotification, nsDOMEventTargetHelper) -NS_IMPL_CYCLE_COLLECTION_UNLINK_END - -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDOMDesktopNotification) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMDesktopNotification) +NS_INTERFACE_MAP_BEGIN(nsDOMDesktopNotification) NS_INTERFACE_MAP_ENTRY(nsIDOMDesktopNotification) NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(DesktopNotification) NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper) diff --git a/dom/src/notification/nsDesktopNotification.h b/dom/src/notification/nsDesktopNotification.h index 74df14ea10b9..73b1d49005a1 100644 --- a/dom/src/notification/nsDesktopNotification.h +++ b/dom/src/notification/nsDesktopNotification.h @@ -72,7 +72,6 @@ class nsDOMDesktopNotification : public nsDOMEventTargetHelper, public: NS_DECL_ISUPPORTS_INHERITED - NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMDesktopNotification,nsDOMEventTargetHelper) NS_DECL_NSIDOMDESKTOPNOTIFICATION nsDOMDesktopNotification(const nsAString & title,