From db48c8c9573d3b754f6db338cb650aea8632c2ba Mon Sep 17 00:00:00 2001 From: David Zbarsky Date: Sun, 22 Dec 2013 11:37:28 -0500 Subject: [PATCH] Bug 888685: SVGPointList doesn't need to inherit nsISupports r=bz --- content/svg/content/src/DOMSVGPointList.cpp | 10 ++-------- content/svg/content/src/DOMSVGPointList.h | 7 +++---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/content/svg/content/src/DOMSVGPointList.cpp b/content/svg/content/src/DOMSVGPointList.cpp index e5c8b98dcd69..fd38cb5ec35f 100644 --- a/content/svg/content/src/DOMSVGPointList.cpp +++ b/content/svg/content/src/DOMSVGPointList.cpp @@ -60,14 +60,8 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(DOMSVGPointList) NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER NS_IMPL_CYCLE_COLLECTION_TRACE_END -NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMSVGPointList) -NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMSVGPointList) - -NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMSVGPointList) - NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY - NS_INTERFACE_MAP_ENTRY(nsISupports) -NS_INTERFACE_MAP_END - +NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(DOMSVGPointList, AddRef) +NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMSVGPointList, Release) /* static */ already_AddRefed DOMSVGPointList::GetDOMWrapper(void *aList, diff --git a/content/svg/content/src/DOMSVGPointList.h b/content/svg/content/src/DOMSVGPointList.h index e6c84a17c15c..3a8bf516116f 100644 --- a/content/svg/content/src/DOMSVGPointList.h +++ b/content/svg/content/src/DOMSVGPointList.h @@ -47,15 +47,14 @@ class SVGAnimatedPointList; * * Our DOM items are created lazily on demand as and when script requests them. */ -class DOMSVGPointList MOZ_FINAL : public nsISupports, - public nsWrapperCache +class DOMSVGPointList MOZ_FINAL : public nsWrapperCache { friend class nsISVGPoint; friend class mozilla::DOMSVGPoint; public: - NS_DECL_CYCLE_COLLECTING_ISUPPORTS - NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGPointList) + NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(DOMSVGPointList) + NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(DOMSVGPointList) virtual JSObject* WrapObject(JSContext *cx, JS::Handle scope) MOZ_OVERRIDE;