wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 840417 Part 1: Move nsIDOMSVGElement up to nsSVGElement r=Ms2ger

Browse Source
This commit is contained in:
David Zbarsky 2013-03-27 21:23:09 -04:00
parent 03993307bd
commit 9131356053
108 changed files with 87 additions and 657 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/public/nsINode.h
View File

@ -1812,6 +1812,12 @@ extern const nsIID kThisPtrOffsetsSID;
NS_OFFSET_AND_INTERFACE_TABLE_BEGIN_AMBIGUOUS(_class, nsINode) \
NS_INTERFACE_TABLE_ENTRY(_class, nsINode)
#define NS_NODE_INTERFACE_TABLE1(_class, _i1) \
NS_NODE_OFFSET_AND_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \
NS_OFFSET_AND_INTERFACE_TABLE_END \
NS_OFFSET_AND_INTERFACE_TABLE_TO_MAP_SEGUE
#define NS_NODE_INTERFACE_TABLE2(_class, _i1, _i2) \
NS_NODE_OFFSET_AND_INTERFACE_TABLE_BEGIN(_class) \
NS_INTERFACE_TABLE_ENTRY(_class, _i1) \

2
content/svg/content/src/DOMSVGStringList.cpp
View File

@ -185,7 +185,7 @@ SVGStringList &
DOMSVGStringList::InternalList()
{
if (mIsConditionalProcessingAttribute) {
nsCOMPtr<dom::SVGTests> tests = do_QueryInterface(mElement);
nsCOMPtr<dom::SVGTests> tests = do_QueryObject(mElement);
return tests->mStringListAttributes[mAttrEnum];
}
return mElement->GetStringListInfo().mStringLists[mAttrEnum];

1
content/svg/content/src/SVGAElement.cpp
View File

@ -49,7 +49,6 @@ SVGAElement::SVGAElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGAElementBase(aNodeInfo),
Link(this)
{
SetIsDOMBinding();
}
already_AddRefed<nsIDOMSVGAnimatedString>

10
content/svg/content/src/SVGAElement.h
View File

@ -20,7 +20,6 @@ namespace dom {
typedef SVGGraphicsElement SVGAElementBase;
class SVGAElement MOZ_FINAL : public SVGAElementBase,
public nsIDOMSVGElement,
public nsILink,
public Link
{
@ -31,15 +30,8 @@ protected:
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// XXX: I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGAElementBase::)
// nsINode interface methods
virtual nsresult PreHandleEvent(nsEventChainPreVisitor& aVisitor);
virtual nsresult PostHandleEvent(nsEventChainPostVisitor& aVisitor);
@ -73,8 +65,6 @@ public:
virtual nsresult UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> Href();
already_AddRefed<nsIDOMSVGAnimatedString> Target();

1
content/svg/content/src/SVGAltGlyphElement.cpp
View File

@ -37,7 +37,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGAltGlyphElement, SVGAltGlyphElementBase,
SVGAltGlyphElement::SVGAltGlyphElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGAltGlyphElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

12
content/svg/content/src/SVGAltGlyphElement.h
View File

@ -17,8 +17,7 @@ namespace dom {
typedef SVGTextPositioningElement SVGAltGlyphElementBase;
class SVGAltGlyphElement MOZ_FINAL : public SVGAltGlyphElementBase,
public nsIDOMSVGElement
class SVGAltGlyphElement MOZ_FINAL : public SVGAltGlyphElementBase
{
protected:
friend nsresult (::NS_NewSVGAltGlyphElement(nsIContent **aResult,
@ -27,23 +26,14 @@ protected:
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx If xpcom allowed virtual inheritance we wouldn't need to
// forward here :-(
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGAltGlyphElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> Href();
void GetGlyphRef(nsAString & aGlyphRef);

10
content/svg/content/src/SVGAnimateElement.h
View File

@ -15,8 +15,7 @@ nsresult NS_NewSVGAnimateElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGAnimateElement MOZ_FINAL : public SVGAnimationElement,
public nsIDOMSVGElement
class SVGAnimateElement MOZ_FINAL : public SVGAnimationElement
{
protected:
SVGAnimateElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -29,20 +28,13 @@ protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGAnimationElement::)
// nsIDOMNode
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
// SVGAnimationElement
virtual nsSMILAnimationFunction& AnimationFunction();
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

10
content/svg/content/src/SVGAnimateMotionElement.h
View File

@ -15,8 +15,7 @@ nsresult NS_NewSVGAnimateMotionElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGAnimateMotionElement MOZ_FINAL : public SVGAnimationElement,
public nsIDOMSVGElement
class SVGAnimateMotionElement MOZ_FINAL : public SVGAnimationElement
{
protected:
SVGAnimateMotionElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -29,13 +28,8 @@ protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGAnimationElement::)
// nsIDOMNode specializations
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
@ -53,8 +47,6 @@ public:
// Utility method to let our <mpath> children tell us when they've changed,
// so we can make sure our mAnimationFunction is marked as having changed.
void MpathChanged() { mAnimationFunction.MpathChanged(); }
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

10
content/svg/content/src/SVGAnimateTransformElement.h
View File

@ -15,8 +15,7 @@ nsresult NS_NewSVGAnimateTransformElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGAnimateTransformElement MOZ_FINAL : public SVGAnimationElement,
public nsIDOMSVGElement
class SVGAnimateTransformElement MOZ_FINAL : public SVGAnimationElement
{
protected:
SVGAnimateTransformElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -29,13 +28,8 @@ protected:
virtual JSObject* WrapNode(JSContext *aCx, JSObject *aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGAnimationElement::)
// nsIDOMNode specializations
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
@ -47,8 +41,6 @@ public:
// SVGAnimationElement
virtual nsSMILAnimationFunction& AnimationFunction();
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGAnimationElement.cpp
View File

@ -53,7 +53,6 @@ SVGAnimationElement::SVGAnimationElement(already_AddRefed<nsINodeInfo> aNodeInfo
#pragma warning(pop)
#endif
{
SetIsDOMBinding();
}
nsresult

1
content/svg/content/src/SVGCircleElement.cpp
View File

@ -39,7 +39,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGCircleElement, SVGCircleElementBase,
SVGCircleElement::SVGCircleElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGCircleElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGCircleElement.h
View File

@ -17,8 +17,7 @@ typedef nsSVGPathGeometryElement SVGCircleElementBase;
namespace mozilla {
namespace dom {
class SVGCircleElement MOZ_FINAL : public SVGCircleElementBase,
public nsIDOMSVGElement
class SVGCircleElement MOZ_FINAL : public SVGCircleElementBase
{
protected:
SVGCircleElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -27,14 +26,8 @@ protected:
already_AddRefed<nsINodeInfo> aNodeInfo));
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGCircleElementBase::)
// nsSVGSVGElement methods:
virtual bool HasValidDimensions() const;
@ -43,8 +36,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> Cx();
already_AddRefed<SVGAnimatedLength> Cy();

1
content/svg/content/src/SVGClipPathElement.cpp
View File

@ -41,7 +41,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(SVGClipPathElement, SVGClipPathElementBase,
SVGClipPathElement::SVGClipPathElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGClipPathElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
already_AddRefed<nsIDOMSVGAnimatedEnumeration>

9
content/svg/content/src/SVGClipPathElement.h
View File

@ -21,7 +21,6 @@ namespace dom {
typedef SVGTransformableElement SVGClipPathElementBase;
class SVGClipPathElement MOZ_FINAL : public SVGClipPathElementBase,
public nsIDOMSVGElement,
public nsIDOMSVGUnitTypes
{
friend class ::nsSVGClipPathFrame;
@ -33,19 +32,11 @@ protected:
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGClipPathElementBase::)
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedEnumeration> ClipPathUnits();

38
content/svg/content/src/SVGComponentTransferFunctionElement.h
View File

@ -30,7 +30,6 @@ protected:
SVGComponentTransferFunctionElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGComponentTransferFunctionElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
public:
@ -84,8 +83,7 @@ nsresult NS_NewSVGFEFuncRElement(
namespace mozilla {
namespace dom {
class SVGFEFuncRElement : public SVGComponentTransferFunctionElement,
public nsIDOMSVGElement
class SVGFEFuncRElement : public SVGComponentTransferFunctionElement
{
friend nsresult (::NS_NewSVGFEFuncRElement(
nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo));
@ -94,19 +92,12 @@ protected:
: SVGComponentTransferFunctionElement(aNodeInfo) {}
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
virtual int32_t GetChannel() { return 0; }
NS_FORWARD_NSIDOMSVGELEMENT(SVGComponentTransferFunctionElement::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};
@ -120,8 +111,7 @@ nsresult NS_NewSVGFEFuncGElement(
namespace mozilla {
namespace dom {
class SVGFEFuncGElement : public SVGComponentTransferFunctionElement,
public nsIDOMSVGElement
class SVGFEFuncGElement : public SVGComponentTransferFunctionElement
{
friend nsresult (::NS_NewSVGFEFuncGElement(
nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo));
@ -135,14 +125,8 @@ public:
virtual int32_t GetChannel() { return 1; }
NS_FORWARD_NSIDOMSVGELEMENT(SVGComponentTransferFunctionElement::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};
@ -156,8 +140,7 @@ nsresult NS_NewSVGFEFuncBElement(
namespace mozilla {
namespace dom {
class SVGFEFuncBElement : public SVGComponentTransferFunctionElement,
public nsIDOMSVGElement
class SVGFEFuncBElement : public SVGComponentTransferFunctionElement
{
friend nsresult (::NS_NewSVGFEFuncBElement(
nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo));
@ -171,14 +154,8 @@ public:
virtual int32_t GetChannel() { return 2; }
NS_FORWARD_NSIDOMSVGELEMENT(SVGComponentTransferFunctionElement::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};
@ -192,8 +169,7 @@ nsresult NS_NewSVGFEFuncAElement(
namespace mozilla {
namespace dom {
class SVGFEFuncAElement : public SVGComponentTransferFunctionElement,
public nsIDOMSVGElement
class SVGFEFuncAElement : public SVGComponentTransferFunctionElement
{
friend nsresult (::NS_NewSVGFEFuncAElement(
nsIContent** aResult, already_AddRefed<nsINodeInfo> aNodeInfo));
@ -207,14 +183,8 @@ public:
virtual int32_t GetChannel() { return 3; }
NS_FORWARD_NSIDOMSVGELEMENT(SVGComponentTransferFunctionElement::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual JSObject*
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
};

1
content/svg/content/src/SVGDefsElement.cpp
View File

@ -30,7 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGDefsElement, SVGGraphicsElement,
SVGDefsElement::SVGDefsElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGGraphicsElement(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGDefsElement.h
View File

@ -14,8 +14,7 @@ nsresult NS_NewSVGDefsElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGDefsElement MOZ_FINAL : public SVGGraphicsElement,
public nsIDOMSVGElement
class SVGDefsElement MOZ_FINAL : public SVGGraphicsElement
{
protected:
friend nsresult (::NS_NewSVGDefsElement(nsIContent **aResult,
@ -24,21 +23,13 @@ protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGGraphicsElement::)
// nsIContent
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGDescElement.cpp
View File

@ -30,7 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGDescElement, SVGDescElementBase,
SVGDescElement::SVGDescElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGDescElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGDescElement.h
View File

@ -16,8 +16,7 @@ typedef nsSVGElement SVGDescElementBase;
namespace mozilla {
namespace dom {
class SVGDescElement MOZ_FINAL : public SVGDescElementBase,
public nsIDOMSVGElement
class SVGDescElement MOZ_FINAL : public SVGDescElementBase
{
protected:
friend nsresult (::NS_NewSVGDescElement(nsIContent **aResult,
@ -27,18 +26,10 @@ protected:
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGDescElementBase::)
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGEllipseElement.cpp
View File

@ -39,7 +39,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGEllipseElement, SVGEllipseElementBase,
SVGEllipseElement::SVGEllipseElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGEllipseElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGEllipseElement.h
View File

@ -17,8 +17,7 @@ namespace dom {
typedef nsSVGPathGeometryElement SVGEllipseElementBase;
class SVGEllipseElement MOZ_FINAL : public SVGEllipseElementBase,
public nsIDOMSVGElement
class SVGEllipseElement MOZ_FINAL : public SVGEllipseElementBase
{
protected:
SVGEllipseElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -27,14 +26,8 @@ protected:
already_AddRefed<nsINodeInfo> aNodeInfo));
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGEllipseElementBase::)
// nsSVGSVGElement methods:
virtual bool HasValidDimensions() const;
@ -43,8 +36,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> Cx();
already_AddRefed<SVGAnimatedLength> Cy();

11
content/svg/content/src/SVGFEBlendElement.h
View File

@ -23,8 +23,7 @@ static const unsigned short SVG_FEBLEND_MODE_LIGHTEN = 5;
typedef nsSVGFE SVGFEBlendElementBase;
class SVGFEBlendElement : public SVGFEBlendElementBase,
public nsIDOMSVGElement
class SVGFEBlendElement : public SVGFEBlendElementBase
{
friend nsresult (::NS_NewSVGFEBlendElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -32,7 +31,6 @@ protected:
SVGFEBlendElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEBlendElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
@ -49,15 +47,8 @@ public:
virtual nsSVGString& GetResultImageName() { return mStringAttributes[RESULT]; }
virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEBlendElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedString> In2();

11
content/svg/content/src/SVGFEColorMatrixElement.h
View File

@ -24,8 +24,7 @@ static const unsigned short SVG_FECOLORMATRIX_TYPE_SATURATE = 2;
static const unsigned short SVG_FECOLORMATRIX_TYPE_HUE_ROTATE = 3;
static const unsigned short SVG_FECOLORMATRIX_TYPE_LUMINANCE_TO_ALPHA = 4;
class SVGFEColorMatrixElement : public SVGFEColorMatrixElementBase,
public nsIDOMSVGElement
class SVGFEColorMatrixElement : public SVGFEColorMatrixElementBase
{
friend nsresult (::NS_NewSVGFEColorMatrixElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -33,7 +32,6 @@ protected:
SVGFEColorMatrixElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEColorMatrixElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -50,15 +48,8 @@ public:
virtual nsSVGString& GetResultImageName() { return mStringAttributes[RESULT]; }
virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEColorMatrixElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedEnumeration> Type();

11
content/svg/content/src/SVGFEComponentTransferElement.h
View File

@ -16,8 +16,7 @@ nsresult NS_NewSVGFEComponentTransferElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGFEComponentTransferElement : public SVGFEComponentTransferElementBase,
public nsIDOMSVGElement
class SVGFEComponentTransferElement : public SVGFEComponentTransferElementBase
{
friend nsresult (::NS_NewSVGFEComponentTransferElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -25,7 +24,6 @@ protected:
SVGFEComponentTransferElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEComponentTransferElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -42,16 +40,9 @@ public:
virtual nsSVGString& GetResultImageName() { return mStringAttributes[RESULT]; }
virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEComponentTransferElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
// nsIContent
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();

3
content/svg/content/src/SVGFECompositeElement.cpp
View File

@ -66,9 +66,6 @@ NS_INTERFACE_MAP_END_INHERITING(SVGFECompositeElementBase)
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFECompositeElement)
//----------------------------------------------------------------------
// SVGFECompositeElement methods
already_AddRefed<nsIDOMSVGAnimatedString>
SVGFECompositeElement::In1()
{

10
content/svg/content/src/SVGFECompositeElement.h
View File

@ -27,8 +27,7 @@ static const unsigned short SVG_FECOMPOSITE_OPERATOR_ARITHMETIC = 6;
typedef nsSVGFE SVGFECompositeElementBase;
class SVGFECompositeElement : public SVGFECompositeElementBase,
public nsIDOMSVGElement
class SVGFECompositeElement : public SVGFECompositeElementBase
{
friend nsresult (::NS_NewSVGFECompositeElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -36,7 +35,6 @@ protected:
SVGFECompositeElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFECompositeElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -55,15 +53,9 @@ public:
virtual nsIntRect ComputeTargetBBox(const nsTArray<nsIntRect>& aSourceBBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFECompositeElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedString> In2();

10
content/svg/content/src/SVGFEConvolveMatrixElement.h
View File

@ -26,8 +26,7 @@ class SVGAnimatedBoolean;
typedef nsSVGFE SVGFEConvolveMatrixElementBase;
class SVGFEConvolveMatrixElement : public SVGFEConvolveMatrixElementBase,
public nsIDOMSVGElement
class SVGFEConvolveMatrixElement : public SVGFEConvolveMatrixElementBase
{
friend nsresult (::NS_NewSVGFEConvolveMatrixElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -35,7 +34,6 @@ protected:
SVGFEConvolveMatrixElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEConvolveMatrixElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -58,15 +56,9 @@ public:
virtual nsIntRect ComputeChangeBBox(const nsTArray<nsIntRect>& aSourceChangeBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEConvolveMatrixElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedInteger> OrderX();

10
content/svg/content/src/SVGFEDiffuseLightingElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef nsSVGFELightingElement SVGFEDiffuseLightingElementBase;
class SVGFEDiffuseLightingElement : public SVGFEDiffuseLightingElementBase,
public nsIDOMSVGElement
class SVGFEDiffuseLightingElement : public SVGFEDiffuseLightingElementBase
{
friend nsresult (::NS_NewSVGFEDiffuseLightingElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -25,7 +24,6 @@ protected:
SVGFEDiffuseLightingElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEDiffuseLightingElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -33,17 +31,11 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEDiffuseLightingElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual bool AttributeAffectsRendering(
int32_t aNameSpaceID, nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedNumber> SurfaceScale();

10
content/svg/content/src/SVGFEDisplacementMapElement.h
View File

@ -17,8 +17,7 @@ namespace dom {
typedef nsSVGFE SVGFEDisplacementMapElementBase;
class SVGFEDisplacementMapElement : public SVGFEDisplacementMapElementBase,
public nsIDOMSVGElement
class SVGFEDisplacementMapElement : public SVGFEDisplacementMapElementBase
{
protected:
friend nsresult (::NS_NewSVGFEDisplacementMapElement(nsIContent **aResult,
@ -26,7 +25,6 @@ protected:
SVGFEDisplacementMapElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEDisplacementMapElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -49,15 +47,9 @@ public:
virtual nsIntRect ComputeChangeBBox(const nsTArray<nsIntRect>& aSourceChangeBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEDisplacementMapElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedString> In2();

1
content/svg/content/src/SVGFEDistantLightElement.cpp
View File

@ -39,7 +39,6 @@ NS_INTERFACE_MAP_END_INHERITING(SVGFEDistantLightElementBase)
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEDistantLightElement)
//----------------------------------------------------------------------
// nsFEUnstyledElement methods
bool

10
content/svg/content/src/SVGFEDistantLightElement.h
View File

@ -17,8 +17,7 @@ nsresult NS_NewSVGFEDistantLightElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGFEDistantLightElement : public SVGFEDistantLightElementBase,
public nsIDOMSVGElement
class SVGFEDistantLightElement : public SVGFEDistantLightElementBase
{
friend nsresult (::NS_NewSVGFEDistantLightElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -26,7 +25,6 @@ protected:
SVGFEDistantLightElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEDistantLightElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -34,17 +32,11 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEDistantLightElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual bool AttributeAffectsRendering(
int32_t aNameSpaceID, nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedNumber> Azimuth();
already_AddRefed<nsIDOMSVGAnimatedNumber> Elevation();

10
content/svg/content/src/SVGFEFloodElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef nsSVGFE SVGFEFloodElementBase;
class SVGFEFloodElement : public SVGFEFloodElementBase,
public nsIDOMSVGElement
class SVGFEFloodElement : public SVGFEFloodElementBase
{
friend nsresult (::NS_NewSVGFEFloodElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -25,7 +24,6 @@ protected:
SVGFEFloodElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEFloodElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
@ -43,17 +41,11 @@ public:
virtual nsIntRect ComputeTargetBBox(const nsTArray<nsIntRect>& aSourceBBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEFloodElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual bool OperatesOnSRGB(nsSVGFilterInstance*,
int32_t, Image*) { return true; }

2
content/svg/content/src/SVGFEGaussianBlurElement.cpp
View File

@ -44,10 +44,8 @@ NS_INTERFACE_MAP_END_INHERITING(SVGFEGaussianBlurElementBase)
//----------------------------------------------------------------------
// nsIDOMNode methods
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEGaussianBlurElement)
//----------------------------------------------------------------------
already_AddRefed<nsIDOMSVGAnimatedString>

10
content/svg/content/src/SVGFEGaussianBlurElement.h
View File

@ -18,8 +18,7 @@ namespace dom {
typedef nsSVGFE SVGFEGaussianBlurElementBase;
class SVGFEGaussianBlurElement : public SVGFEGaussianBlurElementBase,
public nsIDOMSVGElement
class SVGFEGaussianBlurElement : public SVGFEGaussianBlurElementBase
{
friend nsresult (::NS_NewSVGFEGaussianBlurElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -27,7 +26,6 @@ protected:
SVGFEGaussianBlurElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEGaussianBlurElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -50,15 +48,9 @@ public:
virtual nsIntRect ComputeChangeBBox(const nsTArray<nsIntRect>& aSourceChangeBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEGaussianBlurElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedNumber> StdDeviationX();

1
content/svg/content/src/SVGFEImageElement.cpp
View File

@ -46,7 +46,6 @@ NS_INTERFACE_MAP_END_INHERITING(SVGFEImageElementBase)
SVGFEImageElement::SVGFEImageElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEImageElementBase(aNodeInfo)
{
SetIsDOMBinding();
// We start out broken
AddStatesSilently(NS_EVENT_STATE_BROKEN);
}

8
content/svg/content/src/SVGFEImageElement.h
View File

@ -19,7 +19,6 @@ namespace dom {
typedef nsSVGFE SVGFEImageElementBase;
class SVGFEImageElement : public SVGFEImageElementBase,
public nsIDOMSVGElement,
public nsImageLoadingContent
{
friend class ::SVGFEImageFrame;
@ -47,11 +46,6 @@ public:
virtual nsIntRect ComputeTargetBBox(const nsTArray<nsIntRect>& aSourceBBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEImageElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
// nsIContent
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
@ -69,8 +63,6 @@ public:
void MaybeLoadSVGImage();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> Href();
already_AddRefed<DOMSVGAnimatedPreserveAspectRatio> PreserveAspectRatio();

11
content/svg/content/src/SVGFEMergeElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef nsSVGFE SVGFEMergeElementBase;
class SVGFEMergeElement : public SVGFEMergeElementBase,
public nsIDOMSVGElement
class SVGFEMergeElement : public SVGFEMergeElementBase
{
friend nsresult (::NS_NewSVGFEMergeElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -25,7 +24,6 @@ protected:
SVGFEMergeElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEMergeElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
@ -40,15 +38,8 @@ public:
virtual nsSVGString& GetResultImageName() { return mStringAttributes[RESULT]; }
virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEMergeElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
// nsIContent
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
virtual StringAttributesInfo GetStringInfo();

12
content/svg/content/src/SVGFEMergeNodeElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef SVGFEUnstyledElement SVGFEMergeNodeElementBase;
class SVGFEMergeNodeElement : public SVGFEMergeNodeElementBase,
public nsIDOMSVGElement
class SVGFEMergeNodeElement : public SVGFEMergeNodeElementBase
{
friend nsresult (::NS_NewSVGFEMergeNodeElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -25,18 +24,11 @@ protected:
SVGFEMergeNodeElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEMergeNodeElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEMergeNodeElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual bool AttributeAffectsRendering(
@ -44,8 +36,6 @@ public:
const nsSVGString* GetIn1() { return &mStringAttributes[IN1]; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();

11
content/svg/content/src/SVGFEMorphologyElement.h
View File

@ -19,8 +19,7 @@ namespace dom {
typedef nsSVGFE SVGFEMorphologyElementBase;
class SVGFEMorphologyElement : public SVGFEMorphologyElementBase,
public nsIDOMSVGElement
class SVGFEMorphologyElement : public SVGFEMorphologyElementBase
{
friend nsresult (::NS_NewSVGFEMorphologyElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -28,7 +27,6 @@ protected:
SVGFEMorphologyElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEMorphologyElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -51,15 +49,8 @@ public:
virtual nsIntRect ComputeChangeBBox(const nsTArray<nsIntRect>& aSourceChangeBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEMorphologyElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedEnumeration> Operator();

11
content/svg/content/src/SVGFEOffsetElement.h
View File

@ -18,8 +18,7 @@ namespace dom {
typedef nsSVGFE SVGFEOffsetElementBase;
class SVGFEOffsetElement : public SVGFEOffsetElementBase,
public nsIDOMSVGElement
class SVGFEOffsetElement : public SVGFEOffsetElementBase
{
friend nsresult (::NS_NewSVGFEOffsetElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -27,7 +26,6 @@ protected:
SVGFEOffsetElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEOffsetElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -50,15 +48,8 @@ public:
virtual nsIntRect ComputeChangeBBox(const nsTArray<nsIntRect>& aSourceChangeBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEOffsetElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedNumber> Dx();

10
content/svg/content/src/SVGFEPointLightElement.h
View File

@ -17,8 +17,7 @@ nsresult NS_NewSVGFEPointLightElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGFEPointLightElement : public SVGFEPointLightElementBase,
public nsIDOMSVGElement
class SVGFEPointLightElement : public SVGFEPointLightElementBase
{
friend nsresult (::NS_NewSVGFEPointLightElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -26,7 +25,6 @@ protected:
SVGFEPointLightElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFEPointLightElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
@ -34,17 +32,11 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMSVGELEMENT(SVGFEPointLightElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual bool AttributeAffectsRendering(
int32_t aNameSpaceID, nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedNumber> X();
already_AddRefed<nsIDOMSVGAnimatedNumber> Y();

10
content/svg/content/src/SVGFESpecularLightingElement.h
View File

@ -18,8 +18,7 @@ namespace dom {
typedef nsSVGFELightingElement SVGFESpecularLightingElementBase;
class SVGFESpecularLightingElement : public SVGFESpecularLightingElementBase,
public nsIDOMSVGElement
class SVGFESpecularLightingElement : public SVGFESpecularLightingElementBase
{
friend nsresult (::NS_NewSVGFESpecularLightingElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -27,7 +26,6 @@ protected:
SVGFESpecularLightingElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFESpecularLightingElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -35,10 +33,6 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMSVGELEMENT(SVGFESpecularLightingElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult Filter(nsSVGFilterInstance* aInstance,
@ -48,8 +42,6 @@ public:
virtual bool AttributeAffectsRendering(
int32_t aNameSpaceID, nsIAtom* aAttribute) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();
already_AddRefed<nsIDOMSVGAnimatedNumber> SurfaceScale();

10
content/svg/content/src/SVGFESpotLightElement.h
View File

@ -19,8 +19,7 @@ namespace dom {
typedef SVGFEUnstyledElement SVGFESpotLightElementBase;
class SVGFESpotLightElement : public SVGFESpotLightElementBase,
public nsIDOMSVGElement
class SVGFESpotLightElement : public SVGFESpotLightElementBase
{
friend nsresult (::NS_NewSVGFESpotLightElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -29,7 +28,6 @@ protected:
SVGFESpotLightElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFESpotLightElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -37,17 +35,11 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMSVGELEMENT(SVGFESpotLightElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual bool AttributeAffectsRendering(
int32_t aNameSpaceID, nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedNumber> X();
already_AddRefed<nsIDOMSVGAnimatedNumber> Y();

11
content/svg/content/src/SVGFETileElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef nsSVGFE SVGFETileElementBase;
class SVGFETileElement : public SVGFETileElementBase,
public nsIDOMSVGElement
class SVGFETileElement : public SVGFETileElementBase
{
friend nsresult (::NS_NewSVGFETileElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -25,7 +24,6 @@ protected:
SVGFETileElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFETileElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
@ -50,15 +48,8 @@ public:
virtual nsIntRect ComputeChangeBBox(const nsTArray<nsIntRect>& aSourceChangeBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFETileElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> In1();

11
content/svg/content/src/SVGFETurbulenceElement.h
View File

@ -20,8 +20,7 @@ namespace dom {
typedef nsSVGFE SVGFETurbulenceElementBase;
class SVGFETurbulenceElement : public SVGFETurbulenceElementBase,
public nsIDOMSVGElement
class SVGFETurbulenceElement : public SVGFETurbulenceElementBase
{
friend nsresult (::NS_NewSVGFETurbulenceElement(nsIContent **aResult,
already_AddRefed<nsINodeInfo> aNodeInfo));
@ -29,7 +28,6 @@ protected:
SVGFETurbulenceElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFETurbulenceElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
virtual JSObject* WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
@ -49,15 +47,8 @@ public:
virtual nsIntRect ComputeTargetBBox(const nsTArray<nsIntRect>& aSourceBBoxes,
const nsSVGFilterInstance& aInstance);
NS_FORWARD_NSIDOMSVGELEMENT(SVGFETurbulenceElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedNumber> BaseFrequencyX();
already_AddRefed<nsIDOMSVGAnimatedNumber> BaseFrequencyY();

1
content/svg/content/src/SVGFilterElement.cpp
View File

@ -65,7 +65,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(SVGFilterElement, SVGFilterElementBase,
SVGFilterElement::SVGFilterElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGFilterElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

9
content/svg/content/src/SVGFilterElement.h
View File

@ -26,7 +26,6 @@ namespace dom {
class SVGAnimatedLength;
class SVGFilterElement : public SVGFilterElementBase,
public nsIDOMSVGElement,
public nsIDOMSVGUnitTypes
{
friend class ::nsSVGFilterFrame;
@ -39,15 +38,9 @@ protected:
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGFilterElementBase::)
// nsIContent
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
@ -55,8 +48,6 @@ public:
// Invalidate users of this filter
void Invalidate();
virtual nsIDOMNode* AsDOMNode() { return this; }
// nsSVGSVGElement methods:
virtual bool HasValidDimensions() const;

1
content/svg/content/src/SVGForeignObjectElement.cpp
View File

@ -41,7 +41,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGForeignObjectElement, SVGGraphicsElement,
SVGForeignObjectElement::SVGForeignObjectElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGGraphicsElement(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGForeignObjectElement.h
View File

@ -17,8 +17,7 @@ class nsSVGForeignObjectFrame;
namespace mozilla {
namespace dom {
class SVGForeignObjectElement MOZ_FINAL : public SVGGraphicsElement,
public nsIDOMSVGElement
class SVGForeignObjectElement MOZ_FINAL : public SVGGraphicsElement
{
friend class ::nsSVGForeignObjectFrame;
@ -29,15 +28,9 @@ protected:
virtual JSObject* WrapNode(JSContext *cx, JSObject *scope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGGraphicsElement::)
// nsSVGElement specializations:
virtual gfxMatrix PrependLocalTransformsTo(const gfxMatrix &aMatrix,
TransformTypes aWhich = eAllTransforms) const;
@ -48,8 +41,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> X();
already_AddRefed<SVGAnimatedLength> Y();

1
content/svg/content/src/SVGGElement.cpp
View File

@ -30,7 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGGElement, SVGGraphicsElement,
SVGGElement::SVGGElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGGraphicsElement(aNodeInfo)
{
SetIsDOMBinding();
}

11
content/svg/content/src/SVGGElement.h
View File

@ -14,8 +14,7 @@ nsresult NS_NewSVGGElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGGElement MOZ_FINAL : public SVGGraphicsElement,
public nsIDOMSVGElement
class SVGGElement MOZ_FINAL : public SVGGraphicsElement
{
protected:
SVGGElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -24,21 +23,13 @@ protected:
already_AddRefed<nsINodeInfo> aNodeInfo));
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGGraphicsElement::)
// nsIContent
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGGradientElement.cpp
View File

@ -62,7 +62,6 @@ NS_INTERFACE_MAP_END_INHERITING(SVGGradientElementBase)
SVGGradientElement::SVGGradientElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGGradientElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

19
content/svg/content/src/SVGGradientElement.h
View File

@ -90,7 +90,6 @@ protected:
typedef SVGGradientElement SVGLinearGradientElementBase;
class SVGLinearGradientElement : public SVGLinearGradientElementBase
, public nsIDOMSVGElement
{
friend class ::nsSVGLinearGradientFrame;
friend nsresult
@ -103,19 +102,10 @@ protected:
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// The Gradient Element base class implements these
NS_FORWARD_NSIDOMSVGELEMENT(SVGLinearGradientElementBase::)
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> X1();
already_AddRefed<SVGAnimatedLength> Y1();
@ -136,7 +126,6 @@ protected:
typedef SVGGradientElement SVGRadialGradientElementBase;
class SVGRadialGradientElement : public SVGRadialGradientElementBase
, public nsIDOMSVGElement
{
friend class ::nsSVGRadialGradientFrame;
friend nsresult
@ -149,19 +138,11 @@ protected:
WrapNode(JSContext* aCx, JSObject* aScope) MOZ_OVERRIDE;
public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGRadialGradientElementBase::)
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> Cx();
already_AddRefed<SVGAnimatedLength> Cy();

1
content/svg/content/src/SVGImageElement.cpp
View File

@ -53,7 +53,6 @@ NS_IMPL_ISUPPORTS_INHERITED6(SVGImageElement, SVGImageElementBase,
SVGImageElement::SVGImageElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGImageElementBase(aNodeInfo)
{
SetIsDOMBinding();
// We start out broken
AddStatesSilently(NS_EVENT_STATE_BROKEN);
}

8
content/svg/content/src/SVGImageElement.h
View File

@ -24,7 +24,6 @@ namespace dom {
class DOMSVGAnimatedPreserveAspectRatio;
class SVGImageElement : public SVGImageElementBase,
public nsIDOMSVGElement,
public nsImageLoadingContent
{
friend class ::nsSVGImageFrame;
@ -41,11 +40,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGImageElementBase::)
// nsIContent interface
virtual nsresult AfterSetAttr(int32_t aNamespaceID, nsIAtom* aName,
const nsAttrValue* aValue, bool aNotify);
@ -72,8 +66,6 @@ public:
bool IsImageSrcSetDisabled() const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> X();
already_AddRefed<SVGAnimatedLength> Y();

1
content/svg/content/src/SVGLineElement.cpp
View File

@ -39,7 +39,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGLineElement, SVGLineElementBase,
SVGLineElement::SVGLineElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGLineElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

10
content/svg/content/src/SVGLineElement.h
View File

@ -17,8 +17,7 @@ namespace dom {
typedef nsSVGPathGeometryElement SVGLineElementBase;
class SVGLineElement MOZ_FINAL : public SVGLineElementBase,
public nsIDOMSVGElement
class SVGLineElement MOZ_FINAL : public SVGLineElementBase
{
protected:
SVGLineElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -30,11 +29,6 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGLineElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
@ -45,8 +39,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> X1();
already_AddRefed<SVGAnimatedLength> Y1();

1
content/svg/content/src/SVGMPathElement.cpp
View File

@ -66,7 +66,6 @@ SVGMPathElement::SVGMPathElement(already_AddRefed<nsINodeInfo> aNodeInfo)
#pragma warning(pop)
#endif
{
SetIsDOMBinding();
}
SVGMPathElement::~SVGMPathElement()

8
content/svg/content/src/SVGMPathElement.h
View File

@ -21,7 +21,6 @@ namespace dom {
class SVGPathElement;
class SVGMPathElement MOZ_FINAL : public SVGMPathElementBase,
public nsIDOMSVGElement,
public nsStubMutationObserver
{
protected:
@ -41,11 +40,6 @@ public:
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
// Forward interface implementations to base class
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGMPathElementBase::)
// nsIContent interface
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
@ -66,8 +60,6 @@ public:
// this returns nullptr.
SVGPathElement* GetReferencedPath();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> Href();

1
content/svg/content/src/SVGMarkerElement.cpp
View File

@ -101,7 +101,6 @@ nsSVGOrientType::ToDOMAnimatedEnum(nsSVGElement *aSVGElement)
SVGMarkerElement::SVGMarkerElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGMarkerElementBase(aNodeInfo), mCoordCtx(nullptr)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

10
content/svg/content/src/SVGMarkerElement.h
View File

@ -86,8 +86,7 @@ private:
typedef nsSVGElement SVGMarkerElementBase;
class SVGMarkerElement : public SVGMarkerElementBase,
public nsIDOMSVGElement
class SVGMarkerElement : public SVGMarkerElementBase
{
friend class ::nsSVGMarkerFrame;
@ -102,11 +101,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
@ -126,8 +120,6 @@ public:
nsSVGOrientType* GetOrientType() { return &mOrientType; }
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedRect> ViewBox();
already_AddRefed<DOMSVGAnimatedPreserveAspectRatio> PreserveAspectRatio();

1
content/svg/content/src/SVGMaskElement.cpp
View File

@ -56,7 +56,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(SVGMaskElement, SVGMaskElementBase,
SVGMaskElement::SVGMaskElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGMaskElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

7
content/svg/content/src/SVGMaskElement.h
View File

@ -24,7 +24,6 @@ namespace dom {
typedef nsSVGElement SVGMaskElementBase;
class SVGMaskElement MOZ_FINAL : public SVGMaskElementBase,
public nsIDOMSVGElement,
public nsIDOMSVGUnitTypes
{
friend class ::nsSVGMaskFrame;
@ -39,16 +38,10 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
// nsIContent interface
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// nsSVGSVGElement methods:
virtual bool HasValidDimensions() const;

1
content/svg/content/src/SVGMetadataElement.cpp
View File

@ -31,7 +31,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGMetadataElement, SVGMetadataElementBase,
SVGMetadataElement::SVGMetadataElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGMetadataElementBase(aNodeInfo)
{
SetIsDOMBinding();
}

10
content/svg/content/src/SVGMetadataElement.h
View File

@ -16,8 +16,7 @@ typedef nsSVGElement SVGMetadataElementBase;
namespace mozilla {
namespace dom {
class SVGMetadataElement MOZ_FINAL : public SVGMetadataElementBase,
public nsIDOMSVGElement
class SVGMetadataElement MOZ_FINAL : public SVGMetadataElementBase
{
protected:
friend nsresult (::NS_NewSVGMetadataElement(nsIContent **aResult,
@ -32,14 +31,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGPathElement.cpp
View File

@ -42,7 +42,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGPathElement, SVGPathElementBase,
SVGPathElement::SVGPathElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGPathElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGPathElement.h
View File

@ -24,8 +24,7 @@ class nsISVGPoint;
namespace dom {
class SVGPathElement MOZ_FINAL : public SVGPathElementBase,
public nsIDOMSVGElement
class SVGPathElement MOZ_FINAL : public SVGPathElementBase
{
friend class nsSVGPathFrame;
@ -36,16 +35,10 @@ protected:
SVGPathElement(already_AddRefed<nsINodeInfo> aNodeInfo);
public:
typedef SVGAnimatedPathSegList SVGAnimatedPathSegList;
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGPathElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
@ -63,8 +56,6 @@ public:
// nsIContent interface
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual SVGAnimatedPathSegList* GetAnimPathSegList() {
return &mD;
}

1
content/svg/content/src/SVGPatternElement.cpp
View File

@ -62,7 +62,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(SVGPatternElement, SVGPatternElementBase,
SVGPatternElement::SVGPatternElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGPatternElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

7
content/svg/content/src/SVGPatternElement.h
View File

@ -28,7 +28,6 @@ namespace dom {
typedef nsSVGElement SVGPatternElementBase;
class SVGPatternElement MOZ_FINAL : public SVGPatternElementBase,
public nsIDOMSVGElement,
public nsIDOMSVGUnitTypes
{
friend class ::nsSVGPatternFrame;
@ -45,17 +44,11 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// nsSVGSVGElement methods:
virtual bool HasValidDimensions() const;

1
content/svg/content/src/SVGPolygonElement.cpp
View File

@ -32,7 +32,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGPolygonElement, SVGPolygonElementBase,
SVGPolygonElement::SVGPolygonElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGPolygonElementBase(aNodeInfo)
{
}
//----------------------------------------------------------------------

10
content/svg/content/src/SVGPolygonElement.h
View File

@ -16,8 +16,7 @@ typedef nsSVGPolyElement SVGPolygonElementBase;
namespace mozilla {
namespace dom {
class SVGPolygonElement MOZ_FINAL : public SVGPolygonElementBase,
public nsIDOMSVGElement
class SVGPolygonElement MOZ_FINAL : public SVGPolygonElementBase
{
protected:
SVGPolygonElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -30,18 +29,11 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGPolygonElementBase::)
// nsSVGPathGeometryElement methods:
virtual void GetMarkPoints(nsTArray<nsSVGMark> *aMarks);
virtual void ConstructPath(gfxContext *aCtx);
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGPolylineElement.cpp
View File

@ -30,7 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGPolylineElement, SVGPolylineElementBase,
SVGPolylineElement::SVGPolylineElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGPolylineElementBase(aNodeInfo)
{
}
//----------------------------------------------------------------------

9
content/svg/content/src/SVGPolylineElement.h
View File

@ -16,8 +16,7 @@ typedef nsSVGPolyElement SVGPolylineElementBase;
namespace mozilla {
namespace dom {
class SVGPolylineElement MOZ_FINAL : public SVGPolylineElementBase,
public nsIDOMSVGElement
class SVGPolylineElement MOZ_FINAL : public SVGPolylineElementBase
{
protected:
SVGPolylineElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -30,14 +29,8 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGPolylineElementBase::)
// nsIContent interface
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace mozilla

1
content/svg/content/src/SVGRectElement.cpp
View File

@ -45,7 +45,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGRectElement, SVGRectElementBase,
SVGRectElement::SVGRectElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGRectElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

10
content/svg/content/src/SVGRectElement.h
View File

@ -17,8 +17,7 @@ typedef nsSVGPathGeometryElement SVGRectElementBase;
namespace mozilla {
namespace dom {
class SVGRectElement MOZ_FINAL : public SVGRectElementBase,
public nsIDOMSVGElement
class SVGRectElement MOZ_FINAL : public SVGRectElementBase
{
protected:
SVGRectElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -30,11 +29,6 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGRectElementBase::)
// nsSVGSVGElement methods:
virtual bool HasValidDimensions() const;
@ -43,8 +37,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> X();
already_AddRefed<SVGAnimatedLength> Y();

1
content/svg/content/src/SVGSVGElement.cpp
View File

@ -174,7 +174,6 @@ SVGSVGElement::SVGSVGElement(already_AddRefed<nsINodeInfo> aNodeInfo,
mHasChildrenOnlyTransform(false),
mUseCurrentView(false)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

10
content/svg/content/src/SVGSVGElement.h
View File

@ -81,8 +81,7 @@ public:
typedef SVGGraphicsElement SVGSVGElementBase;
class SVGSVGElement MOZ_FINAL : public SVGSVGElementBase,
public nsIDOMSVGElement
class SVGSVGElement MOZ_FINAL : public SVGSVGElementBase
{
friend class ::nsSVGOuterSVGFrame;
friend class ::nsSVGInnerSVGFrame;
@ -102,11 +101,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SVGSVGElement, SVGSVGElementBase)
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGSVGElementBase::)
/**
* For use by zoom controls to allow currentScale, currentTranslate.x and
* currentTranslate.y to be set by a single operation that dispatches a
@ -218,8 +212,6 @@ public:
mViewportHeight = aSize.height;
}
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<SVGAnimatedLength> X();
already_AddRefed<SVGAnimatedLength> Y();

1
content/svg/content/src/SVGScriptElement.cpp
View File

@ -43,7 +43,6 @@ SVGScriptElement::SVGScriptElement(already_AddRefed<nsINodeInfo> aNodeInfo,
: SVGScriptElementBase(aNodeInfo)
, nsScriptElement(aFromParser)
{
SetIsDOMBinding();
AddMutationObserver(this);
}

9
content/svg/content/src/SVGScriptElement.h
View File

@ -24,7 +24,6 @@ namespace dom {
typedef nsSVGElement SVGScriptElementBase;
class SVGScriptElement MOZ_FINAL : public SVGScriptElementBase,
public nsIDOMSVGElement,
public nsScriptElement
{
protected:
@ -41,12 +40,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx If xpcom allowed virtual inheritance we wouldn't need to
// forward here :-(
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGScriptElementBase::)
// nsIScriptElement
virtual void GetScriptType(nsAString& type);
virtual void GetScriptText(nsAString& text);
@ -70,8 +63,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
void GetType(nsAString & aType);
void SetType(const nsAString & aType, ErrorResult& rv);

9
content/svg/content/src/SVGSetElement.h
View File

@ -15,8 +15,7 @@ nsresult NS_NewSVGSetElement(nsIContent **aResult,
namespace mozilla {
namespace dom {
class SVGSetElement MOZ_FINAL : public SVGAnimationElement,
public nsIDOMSVGElement
class SVGSetElement MOZ_FINAL : public SVGAnimationElement
{
protected:
SVGSetElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -32,17 +31,11 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGAnimationElement::)
// nsIDOMNode
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
// SVGAnimationElement
virtual nsSMILAnimationFunction& AnimationFunction();
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGStopElement.cpp
View File

@ -33,7 +33,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGStopElement, SVGStopElementBase,
SVGStopElement::SVGStopElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGStopElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGStopElement.h
View File

@ -17,8 +17,7 @@ typedef nsSVGElement SVGStopElementBase;
namespace mozilla {
namespace dom {
class SVGStopElement MOZ_FINAL : public SVGStopElementBase,
public nsIDOMSVGElement
class SVGStopElement MOZ_FINAL : public SVGStopElementBase
{
protected:
friend nsresult (::NS_NewSVGStopElement(nsIContent **aResult,
@ -31,19 +30,11 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx If xpcom allowed virtual inheritance we wouldn't need to
// forward here :-(
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGStopElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedNumber> Offset();

1
content/svg/content/src/SVGStyleElement.cpp
View File

@ -47,7 +47,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
SVGStyleElement::SVGStyleElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGStyleElementBase(aNodeInfo)
{
SetIsDOMBinding();
AddMutationObserver(this);
}

8
content/svg/content/src/SVGStyleElement.h
View File

@ -19,7 +19,6 @@ namespace mozilla {
namespace dom {
class SVGStyleElement MOZ_FINAL : public SVGStyleElementBase,
public nsIDOMSVGElement,
public nsStyleLinkElement,
public nsStubMutationObserver
{
@ -36,11 +35,6 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SVGStyleElement,
SVGStyleElementBase)
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGStyleElementBase::)
// nsIContent
virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent,
nsIContent* aBindingParent,
@ -70,8 +64,6 @@ public:
NS_DECL_NSIMUTATIONOBSERVER_CONTENTINSERTED
NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
void GetXmlspace(nsAString & aXmlspace);
void SetXmlspace(const nsAString & aXmlspace, ErrorResult& rv);

1
content/svg/content/src/SVGSwitchElement.cpp
View File

@ -47,7 +47,6 @@ NS_INTERFACE_MAP_END_INHERITING(SVGSwitchElementBase)
SVGSwitchElement::SVGSwitchElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGSwitchElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
void

10
content/svg/content/src/SVGSwitchElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef SVGGraphicsElement SVGSwitchElementBase;
class SVGSwitchElement MOZ_FINAL : public SVGSwitchElementBase,
public nsIDOMSVGElement
class SVGSwitchElement MOZ_FINAL : public SVGSwitchElementBase
{
friend class nsSVGSwitchFrame;
protected:
@ -36,11 +35,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SVGSwitchElement,
SVGSwitchElementBase)
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGSwitchElementBase::)
// nsINode
virtual nsresult InsertChildAt(nsIContent* aKid, uint32_t aIndex,
bool aNotify);
@ -50,8 +44,6 @@ public:
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
private:
void UpdateActiveChild()
{ mActiveChild = FindActiveChild(); }

1
content/svg/content/src/SVGSymbolElement.cpp
View File

@ -30,7 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(SVGSymbolElement, SVGSymbolElementBase,
SVGSymbolElement::SVGSymbolElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGSymbolElementBase(aNodeInfo)
{
SetIsDOMBinding();
}

8
content/svg/content/src/SVGSymbolElement.h
View File

@ -20,7 +20,6 @@ namespace dom {
typedef nsSVGElement SVGSymbolElementBase;
class SVGSymbolElement MOZ_FINAL : public SVGSymbolElementBase,
public nsIDOMSVGElement,
public SVGTests
{
protected:
@ -34,18 +33,11 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(nsSVGElement::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* name) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedRect> ViewBox();
already_AddRefed<DOMSVGAnimatedPreserveAspectRatio> PreserveAspectRatio();

1
content/svg/content/src/SVGTSpanElement.cpp
View File

@ -32,7 +32,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGTSpanElement, SVGTSpanElementBase,
SVGTSpanElement::SVGTSpanElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGTSpanElementBase(aNodeInfo)
{
SetIsDOMBinding();
}

11
content/svg/content/src/SVGTSpanElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef SVGTextPositioningElement SVGTSpanElementBase;
class SVGTSpanElement MOZ_FINAL : public SVGTSpanElementBase,
public nsIDOMSVGElement
class SVGTSpanElement MOZ_FINAL : public SVGTSpanElementBase
{
protected:
friend nsresult (::NS_NewSVGTSpanElement(nsIContent **aResult,
@ -30,18 +29,10 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx If xpcom allowed virtual inheritance we wouldn't need to
// forward here :-(
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGTSpanElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
protected:
// nsSVGElement overrides

12
content/svg/content/src/SVGTests.cpp
View File

@ -31,7 +31,8 @@ SVGTests::SVGTests()
already_AddRefed<nsIDOMSVGStringList>
SVGTests::RequiredFeatures()
{
nsCOMPtr<nsSVGElement> element = do_QueryInterface(this);
nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
return DOMSVGStringList::GetDOMWrapper(
&mStringListAttributes[FEATURES], element, true, FEATURES).get();
}
@ -39,7 +40,8 @@ SVGTests::RequiredFeatures()
already_AddRefed<nsIDOMSVGStringList>
SVGTests::RequiredExtensions()
{
nsCOMPtr<nsSVGElement> element = do_QueryInterface(this);
nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
return DOMSVGStringList::GetDOMWrapper(
&mStringListAttributes[EXTENSIONS], element, true, EXTENSIONS).get();
}
@ -47,7 +49,8 @@ SVGTests::RequiredExtensions()
already_AddRefed<nsIDOMSVGStringList>
SVGTests::SystemLanguage()
{
nsCOMPtr<nsSVGElement> element = do_QueryInterface(this);
nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
return DOMSVGStringList::GetDOMWrapper(
&mStringListAttributes[LANGUAGE], element, true, LANGUAGE).get();
}
@ -229,7 +232,8 @@ SVGTests::GetAttrValue(uint8_t aAttrEnum, nsAttrValue& aValue) const
void
SVGTests::MaybeInvalidate()
{
nsCOMPtr<nsSVGElement> element = do_QueryInterface(this);
nsCOMPtr<nsIDOMSVGElement> elem = do_QueryInterface(this);
nsSVGElement* element = static_cast<nsSVGElement*>(elem.get());
nsIContent* parent = element->GetFlattenedTreeParent();

1
content/svg/content/src/SVGTextElement.cpp
View File

@ -30,7 +30,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGTextElement, SVGTextElementBase,
SVGTextElement::SVGTextElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGTextElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

11
content/svg/content/src/SVGTextElement.h
View File

@ -16,8 +16,7 @@ namespace dom {
typedef SVGTextPositioningElement SVGTextElementBase;
class SVGTextElement MOZ_FINAL : public SVGTextElementBase,
public nsIDOMSVGElement
class SVGTextElement MOZ_FINAL : public SVGTextElementBase
{
protected:
SVGTextElement(already_AddRefed<nsINodeInfo> aNodeInfo);
@ -31,18 +30,10 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx If xpcom allowed virtual inheritance we wouldn't need to
// forward here :-(
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGTextElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
};
} // namespace dom

1
content/svg/content/src/SVGTextPathElement.cpp
View File

@ -71,7 +71,6 @@ NS_IMPL_ISUPPORTS_INHERITED3(SVGTextPathElement, SVGTextPathElementBase,
SVGTextPathElement::SVGTextPathElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGTextPathElementBase(aNodeInfo)
{
SetIsDOMBinding();
}
//----------------------------------------------------------------------

12
content/svg/content/src/SVGTextPathElement.h
View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_SVGTextPathElement_h
#define mozilla_dom_SVGTextPathElement_h
#include "nsIDOMSVGElement.h"
#include "nsSVGEnum.h"
#include "nsSVGLength2.h"
#include "nsSVGString.h"
@ -34,8 +33,7 @@ static const unsigned short TEXTPATH_SPACINGTYPE_EXACT = 2;
typedef SVGTextContentElement SVGTextPathElementBase;
class SVGTextPathElement MOZ_FINAL : public SVGTextPathElementBase,
public nsIDOMSVGElement
class SVGTextPathElement MOZ_FINAL : public SVGTextPathElementBase
{
friend class ::nsSVGTextPathFrame;
friend class ::nsSVGTextFrame2;
@ -51,19 +49,11 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx If xpcom allowed virtual inheritance we wouldn't need to
// forward here :-(
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGTextPathElementBase::)
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
virtual bool IsEventAttributeName(nsIAtom* aName) MOZ_OVERRIDE;
// WebIDL

1
content/svg/content/src/SVGTitleElement.cpp
View File

@ -31,7 +31,6 @@ NS_IMPL_ISUPPORTS_INHERITED4(SVGTitleElement, SVGTitleElementBase,
SVGTitleElement::SVGTitleElement(already_AddRefed<nsINodeInfo> aNodeInfo)
: SVGTitleElementBase(aNodeInfo)
{
SetIsDOMBinding();
AddMutationObserver(this);
}

10
content/svg/content/src/SVGTitleElement.h
View File

@ -17,8 +17,7 @@ namespace mozilla {
namespace dom {
class SVGTitleElement MOZ_FINAL : public SVGTitleElementBase,
public nsStubMutationObserver,
public nsIDOMSVGElement
public nsStubMutationObserver
{
protected:
friend nsresult (::NS_NewSVGTitleElement(nsIContent **aResult,
@ -32,11 +31,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGTitleElementBase::)
// nsIMutationObserver
NS_DECL_NSIMUTATIONOBSERVER_CHARACTERDATACHANGED
NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED
@ -53,8 +47,6 @@ public:
bool aNullParent = true);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual nsIDOMNode* AsDOMNode() { return this; }
private:
void SendTitleChangeEvent(bool aBound);
};

2
content/svg/content/src/SVGTransformableElement.h
View File

@ -59,6 +59,8 @@ public:
return nsGkAtoms::transform;
}
virtual bool IsTransformable() { return true; }
protected:
// nsSVGElement overrides

1
content/svg/content/src/SVGUseElement.cpp
View File

@ -83,7 +83,6 @@ SVGUseElement::SVGUseElement(already_AddRefed<nsINodeInfo> aNodeInfo)
#pragma warning(pop)
#endif
{
SetIsDOMBinding();
}
SVGUseElement::~SVGUseElement()

8
content/svg/content/src/SVGUseElement.h
View File

@ -31,7 +31,6 @@ namespace dom {
typedef SVGGraphicsElement SVGUseElementBase;
class SVGUseElement MOZ_FINAL : public SVGUseElementBase,
public nsIDOMSVGElement,
public nsStubMutationObserver
{
friend class ::nsSVGUseFrame;
@ -55,11 +54,6 @@ public:
NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
NS_DECL_NSIMUTATIONOBSERVER_NODEWILLBEDESTROYED
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
NS_FORWARD_NSIDOMELEMENT_TO_GENERIC
NS_FORWARD_NSIDOMSVGELEMENT(SVGUseElementBase::)
// for nsSVGUseFrame's nsIAnonymousContentCreator implementation.
nsIContent* CreateAnonymousContent();
nsIContent* GetAnonymousContent() const { return mClone; }
@ -74,8 +68,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
already_AddRefed<nsIDOMSVGAnimatedString> Href();
already_AddRefed<SVGAnimatedLength> X();

Some files were not shown because too many files have changed in this diff Show More