From c33518f27ec5e9a8fd6621bf024dfdc7eed89e84 Mon Sep 17 00:00:00 2001 From: David Zbarsky Date: Sat, 2 Feb 2013 15:22:36 -0500 Subject: [PATCH] Bug 833446: Remove nsIDOMSVGAnimateMotionElement r=peterv --- .../svg/content/src/SVGAnimateMotionElement.cpp | 17 ++++------------- .../svg/content/src/SVGAnimateMotionElement.h | 6 +----- dom/base/nsDOMClassInfo.cpp | 11 ----------- dom/base/nsDOMClassInfoClasses.h | 1 - dom/interfaces/svg/Makefile.in | 1 - .../svg/nsIDOMSVGAnimateMotionElement.idl | 9 --------- 6 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 dom/interfaces/svg/nsIDOMSVGAnimateMotionElement.idl diff --git a/content/svg/content/src/SVGAnimateMotionElement.cpp b/content/svg/content/src/SVGAnimateMotionElement.cpp index aa3de785595e..d1e2134348c7 100644 --- a/content/svg/content/src/SVGAnimateMotionElement.cpp +++ b/content/svg/content/src/SVGAnimateMotionElement.cpp @@ -6,8 +6,6 @@ #include "mozilla/dom/SVGAnimateMotionElement.h" #include "mozilla/dom/SVGAnimateMotionElementBinding.h" -DOMCI_NODE_DATA(SVGAnimateMotionElement, mozilla::dom::SVGAnimateMotionElement) - NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(AnimateMotion) namespace mozilla { @@ -21,17 +19,10 @@ SVGAnimateMotionElement::WrapNode(JSContext *aCx, JSObject *aScope, bool *aTried //---------------------------------------------------------------------- // nsISupports methods - -NS_IMPL_ADDREF_INHERITED(SVGAnimateMotionElement, SVGAnimationElement) -NS_IMPL_RELEASE_INHERITED(SVGAnimateMotionElement, SVGAnimationElement) - -NS_INTERFACE_TABLE_HEAD(SVGAnimateMotionElement) - NS_NODE_INTERFACE_TABLE5(SVGAnimateMotionElement, nsIDOMNode, - nsIDOMElement, nsIDOMSVGElement, - nsIDOMSVGAnimationElement, - nsIDOMSVGAnimateMotionElement) - NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimateMotionElement) -NS_INTERFACE_MAP_END_INHERITING(SVGAnimationElement) +NS_IMPL_ISUPPORTS_INHERITED4(SVGAnimateMotionElement, SVGAnimationElement, + nsIDOMNode, + nsIDOMElement, nsIDOMSVGElement, + nsIDOMSVGAnimationElement) //---------------------------------------------------------------------- // Implementation diff --git a/content/svg/content/src/SVGAnimateMotionElement.h b/content/svg/content/src/SVGAnimateMotionElement.h index 33f5d7f04e02..a6d5e2b48c38 100644 --- a/content/svg/content/src/SVGAnimateMotionElement.h +++ b/content/svg/content/src/SVGAnimateMotionElement.h @@ -7,7 +7,6 @@ #define mozilla_dom_SVGAnimateMotionElement_h #include "mozilla/dom/SVGAnimationElement.h" -#include "nsIDOMSVGAnimateMotionElement.h" #include "SVGMotionSMILAnimationFunction.h" nsresult NS_NewSVGAnimateMotionElement(nsIContent **aResult, @@ -17,7 +16,7 @@ namespace mozilla { namespace dom { class SVGAnimateMotionElement MOZ_FINAL : public SVGAnimationElement, - public nsIDOMSVGAnimateMotionElement + public nsIDOMSVGAnimationElement { protected: SVGAnimateMotionElement(already_AddRefed aNodeInfo); @@ -32,7 +31,6 @@ protected: public: // interfaces: NS_DECL_ISUPPORTS_INHERITED - NS_DECL_NSIDOMSVGANIMATEMOTIONELEMENT NS_FORWARD_NSIDOMNODE_TO_NSINODE NS_FORWARD_NSIDOMELEMENT_TO_GENERIC @@ -57,8 +55,6 @@ public: // so we can make sure our mAnimationFunction is marked as having changed. void MpathChanged() { mAnimationFunction.MpathChanged(); } - virtual nsXPCClassInfo* GetClassInfo(); - virtual nsIDOMNode* AsDOMNode() { return this; } }; diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 7cb9d033ae9e..c12069ecf442 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -317,7 +317,6 @@ #include "nsIDOMSVGAnimatedRect.h" #include "nsIDOMSVGAnimatedString.h" #include "nsIDOMSVGAnimateTransformElement.h" -#include "nsIDOMSVGAnimateMotionElement.h" #include "nsIDOMSVGMpathElement.h" #include "nsIDOMSVGSetElement.h" #include "nsIDOMSVGAnimationElement.h" @@ -1073,8 +1072,6 @@ static nsDOMClassInfoData sClassInfoData[] = { ELEMENT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(SVGAnimateTransformElement, nsElementSH, ELEMENT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(SVGAnimateMotionElement, nsElementSH, - ELEMENT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(SVGMpathElement, nsElementSH, ELEMENT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(SVGSetElement, nsElementSH, @@ -3017,14 +3014,6 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(SVGAnimateMotionElement, - nsIDOMSVGAnimateMotionElement) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimationElement) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimateMotionElement) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMElementTimeControl) - DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES - DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(SVGSetElement, nsIDOMSVGSetElement) DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimationElement) diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index fd1bff5c3e20..24d843148a99 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -193,7 +193,6 @@ DOMCI_CLASS(SVGDocument) // SVG element classes DOMCI_CLASS(SVGAElement) DOMCI_CLASS(SVGAnimateTransformElement) -DOMCI_CLASS(SVGAnimateMotionElement) DOMCI_CLASS(SVGMpathElement) DOMCI_CLASS(SVGSetElement) DOMCI_CLASS(TimeEvent) diff --git a/dom/interfaces/svg/Makefile.in b/dom/interfaces/svg/Makefile.in index e259fb82e416..1410ceebde08 100644 --- a/dom/interfaces/svg/Makefile.in +++ b/dom/interfaces/svg/Makefile.in @@ -24,7 +24,6 @@ XPIDLSRCS = \ nsIDOMSVGAnimatedNumber.idl \ nsIDOMSVGAnimatedRect.idl \ nsIDOMSVGAnimatedString.idl \ - nsIDOMSVGAnimateMotionElement.idl \ nsIDOMSVGAnimateTransformElement.idl \ nsIDOMSVGAnimationElement.idl \ nsIDOMSVGCircleElement.idl \ diff --git a/dom/interfaces/svg/nsIDOMSVGAnimateMotionElement.idl b/dom/interfaces/svg/nsIDOMSVGAnimateMotionElement.idl deleted file mode 100644 index 2021b1935d7d..000000000000 --- a/dom/interfaces/svg/nsIDOMSVGAnimateMotionElement.idl +++ /dev/null @@ -1,9 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* 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 "nsIDOMSVGAnimationElement.idl" - -[scriptable, uuid(964CDA18-C400-4D1E-B113-2000B4BF777E)] -interface nsIDOMSVGAnimateMotionElement : nsIDOMSVGAnimationElement { };