Bug 824229 Part 2: SVGGraphicsElement should implement SVGTests r=longsonr

This commit is contained in:
David Zbarsky 2013-01-06 01:25:52 -05:00
parent 650241eee0
commit 14d5ddc14d
45 changed files with 67 additions and 122 deletions

View File

@ -36,12 +36,11 @@ NS_IMPL_RELEASE_INHERITED(nsSVGAElement, nsSVGAElementBase)
DOMCI_NODE_DATA(SVGAElement, nsSVGAElement)
NS_INTERFACE_TABLE_HEAD(nsSVGAElement)
NS_NODE_INTERFACE_TABLE8(nsSVGAElement,
NS_NODE_INTERFACE_TABLE7(nsSVGAElement,
nsIDOMNode,
nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGAElement,
nsIDOMSVGTests,
nsIDOMSVGURIReference,
nsILink,
Link)
@ -292,7 +291,7 @@ nsresult
nsSVGAElement::UnsetAttr(int32_t aNameSpaceID, nsIAtom* aAttr,
bool aNotify)
{
nsresult rv = nsSVGAElementBase::UnsetAttr(aNameSpaceID, aAttr, aNotify);
nsresult rv = nsSVGElement::UnsetAttr(aNameSpaceID, aAttr, aNotify);
// The ordering of the parent class's UnsetAttr call and Link::ResetLinkState
// is important here! The attribute is not unset until UnsetAttr returns, and

View File

@ -6,7 +6,6 @@
#ifndef NS_SVGAELEMENT_H_
#define NS_SVGAELEMENT_H_
#include "DOMSVGTests.h"
#include "Link.h"
#include "nsIDOMSVGAElement.h"
#include "nsIDOMSVGURIReference.h"
@ -18,7 +17,6 @@ typedef nsSVGGraphicElement nsSVGAElementBase;
class nsSVGAElement : public nsSVGAElementBase,
public nsIDOMSVGAElement,
public DOMSVGTests,
public nsIDOMSVGURIReference,
public nsILink,
public mozilla::dom::Link

View File

@ -79,10 +79,9 @@ NS_IMPL_RELEASE_INHERITED(nsSVGAltGlyphElement,nsSVGAltGlyphElementBase)
DOMCI_NODE_DATA(SVGAltGlyphElement, nsSVGAltGlyphElement)
NS_INTERFACE_TABLE_HEAD(nsSVGAltGlyphElement)
NS_NODE_INTERFACE_TABLE8(nsSVGAltGlyphElement, nsIDOMNode, nsIDOMElement,
NS_NODE_INTERFACE_TABLE7(nsSVGAltGlyphElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGAltGlyphElement,
nsIDOMSVGTextPositioningElement, nsIDOMSVGTextContentElement,
nsIDOMSVGTests,
nsIDOMSVGURIReference)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAltGlyphElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGAltGlyphElementBase)

View File

@ -51,9 +51,9 @@ NS_IMPL_RELEASE_INHERITED(nsSVGAnimateElement,nsSVGAnimateElementBase)
DOMCI_NODE_DATA(SVGAnimateElement, nsSVGAnimateElement)
NS_INTERFACE_TABLE_HEAD(nsSVGAnimateElement)
NS_NODE_INTERFACE_TABLE6(nsSVGAnimateElement, nsIDOMNode, nsIDOMElement,
NS_NODE_INTERFACE_TABLE5(nsSVGAnimateElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGAnimationElement,
nsIDOMSVGTests, nsIDOMSVGAnimateElement)
nsIDOMSVGAnimateElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimateElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGAnimateElementBase)

View File

@ -16,9 +16,9 @@ NS_IMPL_RELEASE_INHERITED(nsSVGAnimateMotionElement,nsSVGAnimateMotionElementBas
DOMCI_NODE_DATA(SVGAnimateMotionElement, nsSVGAnimateMotionElement)
NS_INTERFACE_TABLE_HEAD(nsSVGAnimateMotionElement)
NS_NODE_INTERFACE_TABLE6(nsSVGAnimateMotionElement, nsIDOMNode,
NS_NODE_INTERFACE_TABLE5(nsSVGAnimateMotionElement, nsIDOMNode,
nsIDOMElement, nsIDOMSVGElement,
nsIDOMSVGAnimationElement, nsIDOMSVGTests,
nsIDOMSVGAnimationElement,
nsIDOMSVGAnimateMotionElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimateMotionElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGAnimateMotionElementBase)

View File

@ -61,10 +61,9 @@ NS_IMPL_RELEASE_INHERITED(nsSVGAnimateTransformElement,nsSVGAnimateTransformElem
DOMCI_NODE_DATA(SVGAnimateTransformElement, nsSVGAnimateTransformElement)
NS_INTERFACE_TABLE_HEAD(nsSVGAnimateTransformElement)
NS_NODE_INTERFACE_TABLE6(nsSVGAnimateTransformElement, nsIDOMNode,
NS_NODE_INTERFACE_TABLE5(nsSVGAnimateTransformElement, nsIDOMNode,
nsIDOMElement, nsIDOMSVGElement,
nsIDOMSVGAnimationElement,
nsIDOMSVGTests,
nsIDOMSVGAnimateTransformElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimateTransformElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGAnimateTransformElementBase)

View File

@ -89,9 +89,7 @@ nsSVGAnimationElement::AsElement()
bool
nsSVGAnimationElement::PassesConditionalProcessingTests()
{
nsCOMPtr<DOMSVGTests> tests(do_QueryInterface(
static_cast<nsSVGElement*>(this)));
return tests->PassesConditionalProcessingTests();
return DOMSVGTests::PassesConditionalProcessingTests();
}
const nsAttrValue*

View File

@ -71,8 +71,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGCircleElement,nsSVGCircleElementBase)
DOMCI_NODE_DATA(SVGCircleElement, nsSVGCircleElement)
NS_INTERFACE_TABLE_HEAD(nsSVGCircleElement)
NS_NODE_INTERFACE_TABLE5(nsSVGCircleElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGCircleElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGCircleElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGCircleElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGCircleElementBase)

View File

@ -29,8 +29,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGClipPathElement,nsSVGClipPathElementBase)
DOMCI_NODE_DATA(SVGClipPathElement, nsSVGClipPathElement)
NS_INTERFACE_TABLE_HEAD(nsSVGClipPathElement)
NS_NODE_INTERFACE_TABLE6(nsSVGClipPathElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE5(nsSVGClipPathElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGClipPathElement,
nsIDOMSVGUnitTypes)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGClipPathElement)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGCLIPPATHELEMENT_H__
#define __NS_SVGCLIPPATHELEMENT_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGClipPathElement.h"
#include "nsIDOMSVGUnitTypes.h"
#include "nsSVGEnum.h"
@ -16,7 +15,6 @@ typedef nsSVGGraphicElement nsSVGClipPathElementBase;
class nsSVGClipPathElement : public nsSVGClipPathElementBase,
public nsIDOMSVGClipPathElement,
public DOMSVGTests,
public nsIDOMSVGUnitTypes
{
friend class nsSVGClipPathFrame;

View File

@ -7,15 +7,13 @@
#include "nsSVGGraphicElement.h"
#include "nsIDOMSVGDefsElement.h"
#include "DOMSVGTests.h"
using namespace mozilla;
typedef nsSVGGraphicElement nsSVGDefsElementBase;
class nsSVGDefsElement : public nsSVGDefsElementBase,
public nsIDOMSVGDefsElement,
public DOMSVGTests
public nsIDOMSVGDefsElement
{
protected:
friend nsresult NS_NewSVGDefsElement(nsIContent **aResult,
@ -59,8 +57,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGDefsElement,nsSVGDefsElementBase)
DOMCI_NODE_DATA(SVGDefsElement, nsSVGDefsElement)
NS_INTERFACE_TABLE_HEAD(nsSVGDefsElement)
NS_NODE_INTERFACE_TABLE5(nsSVGDefsElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGDefsElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGDefsElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGDefsElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGDefsElementBase)

View File

@ -72,8 +72,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGEllipseElement,nsSVGEllipseElementBase)
DOMCI_NODE_DATA(SVGEllipseElement, nsSVGEllipseElement)
NS_INTERFACE_TABLE_HEAD(nsSVGEllipseElement)
NS_NODE_INTERFACE_TABLE5(nsSVGEllipseElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGEllipseElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGEllipseElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGEllipseElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGEllipseElementBase)

View File

@ -53,8 +53,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGFilterElement,nsSVGFilterElementBase)
DOMCI_NODE_DATA(SVGFilterElement, nsSVGFilterElement)
NS_INTERFACE_TABLE_HEAD(nsSVGFilterElement)
NS_NODE_INTERFACE_TABLE6(nsSVGFilterElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE5(nsSVGFilterElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGFilterElement,
nsIDOMSVGURIReference)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGFilterElement)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGFILTERELEMENT_H__
#define __NS_SVGFILTERELEMENT_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGFilterElement.h"
#include "nsIDOMSVGUnitTypes.h"
#include "nsIDOMSVGURIReference.h"
@ -16,11 +15,10 @@
#include "nsSVGLength2.h"
#include "nsSVGString.h"
typedef nsSVGGraphicElement nsSVGFilterElementBase;
typedef nsSVGElement nsSVGFilterElementBase;
class nsSVGFilterElement : public nsSVGFilterElementBase,
public nsIDOMSVGFilterElement,
public DOMSVGTests,
public nsIDOMSVGURIReference,
public nsIDOMSVGUnitTypes
{

View File

@ -29,8 +29,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGForeignObjectElement,nsSVGForeignObjectElementBas
DOMCI_NODE_DATA(SVGForeignObjectElement, nsSVGForeignObjectElement)
NS_INTERFACE_TABLE_HEAD(nsSVGForeignObjectElement)
NS_NODE_INTERFACE_TABLE5(nsSVGForeignObjectElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGForeignObjectElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGForeignObjectElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGForeignObjectElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGForeignObjectElementBase)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGFOREIGNOBJECTELEMENT_H__
#define __NS_SVGFOREIGNOBJECTELEMENT_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGForeignObjectElem.h"
#include "nsSVGGraphicElement.h"
#include "nsSVGLength2.h"
@ -14,8 +13,7 @@
typedef nsSVGGraphicElement nsSVGForeignObjectElementBase;
class nsSVGForeignObjectElement : public nsSVGForeignObjectElementBase,
public nsIDOMSVGForeignObjectElement,
public DOMSVGTests
public nsIDOMSVGForeignObjectElement
{
friend class nsSVGForeignObjectFrame;

View File

@ -7,15 +7,13 @@
#include "nsSVGGraphicElement.h"
#include "nsIDOMSVGGElement.h"
#include "DOMSVGTests.h"
using namespace mozilla;
typedef nsSVGGraphicElement nsSVGGElementBase;
class nsSVGGElement : public nsSVGGElementBase,
public nsIDOMSVGGElement,
public DOMSVGTests
public nsIDOMSVGGElement
{
protected:
friend nsresult NS_NewSVGGElement(nsIContent **aResult,
@ -59,8 +57,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGGElement,nsSVGGElementBase)
DOMCI_NODE_DATA(SVGGElement, nsSVGGElement)
NS_INTERFACE_TABLE_HEAD(nsSVGGElement)
NS_NODE_INTERFACE_TABLE5(nsSVGGElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGGElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGGElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGGElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGGElementBase)

View File

@ -30,6 +30,7 @@ NS_IMPL_RELEASE_INHERITED(nsSVGGraphicElement, nsSVGGraphicElementBase)
NS_INTERFACE_MAP_BEGIN(nsSVGGraphicElement)
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGLocatable)
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGTransformable)
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGTests)
NS_INTERFACE_MAP_END_INHERITING(nsSVGGraphicElementBase)
//----------------------------------------------------------------------

View File

@ -11,10 +11,12 @@
#include "nsIDOMSVGTransformable.h"
#include "nsSVGElement.h"
#include "SVGAnimatedTransformList.h"
#include "DOMSVGTests.h"
typedef nsSVGElement nsSVGGraphicElementBase;
class nsSVGGraphicElement : public nsSVGGraphicElementBase,
public DOMSVGTests,
public nsIDOMSVGTransformable // : nsIDOMSVGLocatable
{
protected:

View File

@ -40,8 +40,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGImageElement,nsSVGImageElementBase)
DOMCI_NODE_DATA(SVGImageElement, nsSVGImageElement)
NS_INTERFACE_TABLE_HEAD(nsSVGImageElement)
NS_NODE_INTERFACE_TABLE9(nsSVGImageElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE8(nsSVGImageElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGImageElement,
nsIDOMSVGURIReference, imgINotificationObserver,
nsIImageLoadingContent, imgIOnloadBlocker)

View File

@ -74,8 +74,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGLineElement,nsSVGLineElementBase)
DOMCI_NODE_DATA(SVGLineElement, nsSVGLineElement)
NS_INTERFACE_TABLE_HEAD(nsSVGLineElement)
NS_NODE_INTERFACE_TABLE5(nsSVGLineElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGLineElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGLineElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLineElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGLineElementBase)

View File

@ -262,7 +262,7 @@ nsSVGMarkerElement::UnsetAttr(int32_t aNamespaceID, nsIAtom* aName,
}
}
return nsSVGMarkerElementBase::UnsetAttr(aNamespaceID, aName, aNotify);
return nsSVGElement::UnsetAttr(aNamespaceID, aName, aNotify);
}
//----------------------------------------------------------------------

View File

@ -44,8 +44,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGMaskElement,nsSVGMaskElementBase)
DOMCI_NODE_DATA(SVGMaskElement, nsSVGMaskElement)
NS_INTERFACE_TABLE_HEAD(nsSVGMaskElement)
NS_NODE_INTERFACE_TABLE6(nsSVGMaskElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE5(nsSVGMaskElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGMaskElement, nsIDOMSVGUnitTypes)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGMaskElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGMaskElementBase)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGMASKELEMENT_H__
#define __NS_SVGMASKELEMENT_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGMaskElement.h"
#include "nsIDOMSVGUnitTypes.h"
#include "nsSVGEnum.h"
@ -19,7 +18,6 @@ typedef nsSVGElement nsSVGMaskElementBase;
class nsSVGMaskElement : public nsSVGMaskElementBase,
public nsIDOMSVGMaskElement,
public DOMSVGTests,
public nsIDOMSVGUnitTypes
{
friend class nsSVGMaskFrame;

View File

@ -30,8 +30,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGPathElement,nsSVGPathElementBase)
DOMCI_NODE_DATA(SVGPathElement, nsSVGPathElement)
NS_INTERFACE_TABLE_HEAD(nsSVGPathElement)
NS_NODE_INTERFACE_TABLE6(nsSVGPathElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE5(nsSVGPathElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGPathElement, nsIDOMSVGAnimatedPathData)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPathElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGPathElementBase)

View File

@ -12,7 +12,6 @@ NS_IMPL_ADDREF_INHERITED(nsSVGPathGeometryElement, nsSVGPathGeometryElementBase)
NS_IMPL_RELEASE_INHERITED(nsSVGPathGeometryElement, nsSVGPathGeometryElementBase)
NS_INTERFACE_MAP_BEGIN(nsSVGPathGeometryElement)
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGTests)
NS_INTERFACE_MAP_END_INHERITING(nsSVGPathGeometryElementBase)
//----------------------------------------------------------------------

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGPATHGEOMETRYELEMENT_H__
#define __NS_SVGPATHGEOMETRYELEMENT_H__
#include "DOMSVGTests.h"
#include "gfxMatrix.h"
#include "nsSVGGraphicElement.h"
#include "nsTArray.h"
@ -21,8 +20,7 @@ class gfxContext;
typedef nsSVGGraphicElement nsSVGPathGeometryElementBase;
class nsSVGPathGeometryElement : public nsSVGPathGeometryElementBase,
public DOMSVGTests
class nsSVGPathGeometryElement : public nsSVGPathGeometryElementBase
{
public:
nsSVGPathGeometryElement(already_AddRefed<nsINodeInfo> aNodeInfo);

View File

@ -51,8 +51,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGPatternElement,nsSVGPatternElementBase)
DOMCI_NODE_DATA(SVGPatternElement, nsSVGPatternElement)
NS_INTERFACE_TABLE_HEAD(nsSVGPatternElement)
NS_NODE_INTERFACE_TABLE8(nsSVGPatternElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE7(nsSVGPatternElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGFitToViewBox, nsIDOMSVGURIReference,
nsIDOMSVGPatternElement, nsIDOMSVGUnitTypes)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPatternElement)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGPATTERNELEMENT_H__
#define __NS_SVGPATTERNELEMENT_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGFitToViewBox.h"
#include "nsIDOMSVGPatternElement.h"
#include "nsIDOMSVGUnitTypes.h"
@ -25,7 +24,6 @@ typedef nsSVGElement nsSVGPatternElementBase;
class nsSVGPatternElement : public nsSVGPatternElementBase,
public nsIDOMSVGPatternElement,
public DOMSVGTests,
public nsIDOMSVGURIReference,
public nsIDOMSVGFitToViewBox,
public nsIDOMSVGUnitTypes

View File

@ -51,8 +51,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGPolygonElement,nsSVGPolygonElementBase)
DOMCI_NODE_DATA(SVGPolygonElement, nsSVGPolygonElement)
NS_INTERFACE_TABLE_HEAD(nsSVGPolygonElement)
NS_NODE_INTERFACE_TABLE5(nsSVGPolygonElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGPolygonElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGPolygonElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPolygonElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGPolygonElementBase)

View File

@ -44,8 +44,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGPolylineElement,nsSVGPolylineElementBase)
DOMCI_NODE_DATA(SVGPolylineElement, nsSVGPolylineElement)
NS_INTERFACE_TABLE_HEAD(nsSVGPolylineElement)
NS_NODE_INTERFACE_TABLE5(nsSVGPolylineElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGPolylineElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGPolylineElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGPolylineElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGPolylineElementBase)

View File

@ -74,8 +74,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGRectElement,nsSVGRectElementBase)
DOMCI_NODE_DATA(SVGRectElement, nsSVGRectElement)
NS_INTERFACE_TABLE_HEAD(nsSVGRectElement)
NS_NODE_INTERFACE_TABLE5(nsSVGRectElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE4(nsSVGRectElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGRectElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGRectElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGRectElementBase)

View File

@ -138,8 +138,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGSVGElement,nsSVGSVGElementBase)
DOMCI_NODE_DATA(SVGSVGElement, nsSVGSVGElement)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsSVGSVGElement)
NS_NODE_INTERFACE_TABLE7(nsSVGSVGElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE6(nsSVGSVGElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGSVGElement,
nsIDOMSVGFitToViewBox,
nsIDOMSVGZoomAndPan)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGSVGELEMENT_H__
#define __NS_SVGSVGELEMENT_H__
#include "DOMSVGTests.h"
#include "mozilla/dom/FromParser.h"
#include "nsIDOMSVGFitToViewBox.h"
#include "nsIDOMSVGLocatable.h"
@ -100,7 +99,6 @@ public:
class nsSVGSVGElement : public nsSVGSVGElementBase,
public nsIDOMSVGSVGElement,
public DOMSVGTests,
public nsIDOMSVGFitToViewBox,
public nsIDOMSVGZoomAndPan
{

View File

@ -51,9 +51,9 @@ NS_IMPL_RELEASE_INHERITED(nsSVGSetElement,nsSVGSetElementBase)
DOMCI_NODE_DATA(SVGSetElement, nsSVGSetElement)
NS_INTERFACE_TABLE_HEAD(nsSVGSetElement)
NS_NODE_INTERFACE_TABLE6(nsSVGSetElement, nsIDOMNode, nsIDOMElement,
NS_NODE_INTERFACE_TABLE5(nsSVGSetElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGAnimationElement,
nsIDOMSVGTests, nsIDOMSVGSetElement)
nsIDOMSVGSetElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGSetElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGSetElementBase)

View File

@ -39,9 +39,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGSwitchElement,nsSVGSwitchElementBase)
DOMCI_NODE_DATA(SVGSwitchElement, nsSVGSwitchElement)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsSVGSwitchElement)
NS_NODE_INTERFACE_TABLE5(nsSVGSwitchElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGSwitchElement,
nsIDOMSVGTests)
NS_NODE_INTERFACE_TABLE4(nsSVGSwitchElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGSwitchElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGSwitchElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGSwitchElementBase)

View File

@ -6,15 +6,13 @@
#ifndef __NS_SVGSWITCHELEMENT_H__
#define __NS_SVGSWITCHELEMENT_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGSwitchElement.h"
#include "nsSVGGraphicElement.h"
typedef nsSVGGraphicElement nsSVGSwitchElementBase;
class nsSVGSwitchElement : public nsSVGSwitchElementBase,
public nsIDOMSVGSwitchElement,
public DOMSVGTests
public nsIDOMSVGSwitchElement
{
friend class nsSVGSwitchFrame;
protected:

View File

@ -62,11 +62,10 @@ NS_IMPL_RELEASE_INHERITED(nsSVGTSpanElement,nsSVGTSpanElementBase)
DOMCI_NODE_DATA(SVGTSpanElement, nsSVGTSpanElement)
NS_INTERFACE_TABLE_HEAD(nsSVGTSpanElement)
NS_NODE_INTERFACE_TABLE7(nsSVGTSpanElement, nsIDOMNode, nsIDOMElement,
NS_NODE_INTERFACE_TABLE6(nsSVGTSpanElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTSpanElement,
nsIDOMSVGTextPositioningElement,
nsIDOMSVGTextContentElement,
nsIDOMSVGTests)
nsIDOMSVGTextContentElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTSpanElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGTSpanElementBase)

View File

@ -16,7 +16,6 @@ NS_IMPL_ADDREF_INHERITED(nsSVGTextContentElement, nsSVGTextContentElementBase)
NS_IMPL_RELEASE_INHERITED(nsSVGTextContentElement, nsSVGTextContentElementBase)
NS_INTERFACE_MAP_BEGIN(nsSVGTextContentElement)
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGTests)
NS_INTERFACE_MAP_END_INHERITING(nsSVGTextContentElementBase)
/* readonly attribute nsIDOMSVGAnimatedLength textLength; */

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGTEXTCONTENTELEMENTBASE_H__
#define __NS_SVGTEXTCONTENTELEMENTBASE_H__
#include "DOMSVGTests.h"
#include "nsIDOMSVGTextContentElement.h"
#include "nsSVGElement.h"
#include "nsSVGTextContainerFrame.h"
@ -19,8 +18,7 @@ typedef nsSVGElement nsSVGTextContentElementBase;
* upshot is that any changes to this class also need to be made in
* nsSVGTextElement.
*/
class nsSVGTextContentElement : public nsSVGTextContentElementBase,
public DOMSVGTests
class nsSVGTextContentElement : public nsSVGTextContentElementBase
{
public:
NS_DECL_ISUPPORTS_INHERITED

View File

@ -19,7 +19,6 @@
#include "SVGAnimatedNumberList.h"
#include "DOMSVGAnimatedNumberList.h"
#include "DOMSVGPoint.h"
#include "DOMSVGTests.h"
using namespace mozilla;
@ -38,8 +37,7 @@ typedef nsSVGGraphicElement nsSVGTextElementBase;
* nsSVGTextPositioningElement in sync (and vice versa).
*/
class nsSVGTextElement : public nsSVGTextElementBase,
public nsIDOMSVGTextElement, // nsIDOMSVGTextPositioningElement
public DOMSVGTests
public nsIDOMSVGTextElement // nsIDOMSVGTextPositioningElement
{
protected:
friend nsresult NS_NewSVGTextElement(nsIContent **aResult,
@ -100,11 +98,10 @@ NS_IMPL_RELEASE_INHERITED(nsSVGTextElement,nsSVGTextElementBase)
DOMCI_NODE_DATA(SVGTextElement, nsSVGTextElement)
NS_INTERFACE_TABLE_HEAD(nsSVGTextElement)
NS_NODE_INTERFACE_TABLE7(nsSVGTextElement, nsIDOMNode, nsIDOMElement,
NS_NODE_INTERFACE_TABLE6(nsSVGTextElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTextElement,
nsIDOMSVGTextPositioningElement,
nsIDOMSVGTextContentElement,
nsIDOMSVGTests)
nsIDOMSVGTextContentElement)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTextElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGTextElementBase)

View File

@ -61,9 +61,9 @@ NS_IMPL_RELEASE_INHERITED(nsSVGTextPathElement,nsSVGTextPathElementBase)
DOMCI_NODE_DATA(SVGTextPathElement, nsSVGTextPathElement)
NS_INTERFACE_TABLE_HEAD(nsSVGTextPathElement)
NS_NODE_INTERFACE_TABLE7(nsSVGTextPathElement, nsIDOMNode, nsIDOMElement,
NS_NODE_INTERFACE_TABLE6(nsSVGTextPathElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTextPathElement,
nsIDOMSVGTextContentElement, nsIDOMSVGTests,
nsIDOMSVGTextContentElement,
nsIDOMSVGURIReference)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGTextPathElement)
NS_INTERFACE_MAP_END_INHERITING(nsSVGTextPathElementBase)

View File

@ -60,8 +60,8 @@ NS_IMPL_RELEASE_INHERITED(nsSVGUseElement,nsSVGUseElementBase)
DOMCI_NODE_DATA(SVGUseElement, nsSVGUseElement)
NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsSVGUseElement)
NS_NODE_INTERFACE_TABLE7(nsSVGUseElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement, nsIDOMSVGTests,
NS_NODE_INTERFACE_TABLE6(nsSVGUseElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGURIReference,
nsIDOMSVGUseElement, nsIMutationObserver)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGUseElement)

View File

@ -6,7 +6,6 @@
#ifndef __NS_SVGUSEELEMENT_H__
#define __NS_SVGUSEELEMENT_H__
#include "DOMSVGTests.h"
#include "mozilla/dom/FromParser.h"
#include "nsIDOMSVGURIReference.h"
#include "nsIDOMSVGUseElement.h"
@ -33,7 +32,6 @@ typedef nsSVGGraphicElement nsSVGUseElementBase;
class nsSVGUseElement : public nsSVGUseElementBase,
public nsIDOMSVGUseElement,
public DOMSVGTests,
public nsIDOMSVGURIReference,
public nsStubMutationObserver
{

View File

@ -3007,12 +3007,12 @@ nsDOMClassInfo::Init()
#define DOM_CLASSINFO_SVG_TEXT_CONTENT_ELEMENT_MAP_ENTRIES \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests) \
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
#define DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGLocatable) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTransformable) \
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests) \
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
// XXX - the proto chain stuff is sort of hackish, because of the MI in
@ -3034,7 +3034,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGAElement, nsIDOMSVGAElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3092,20 +3091,17 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGCircleElement, nsIDOMSVGCircleElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGCircleElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGClipPathElement, nsIDOMSVGClipPathElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGClipPathElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGUnitTypes)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGDefsElement, nsIDOMSVGDefsElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGDefsElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3116,7 +3112,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGEllipseElement, nsIDOMSVGEllipseElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGEllipseElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3259,7 +3254,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGFilterElement, nsIDOMSVGFilterElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFilterElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGUnitTypes)
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
@ -3267,19 +3261,16 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGForeignObjectElement, nsIDOMSVGForeignObjectElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGForeignObjectElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGGElement, nsIDOMSVGGElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGGElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGImageElement, nsIDOMSVGImageElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGImageElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3295,7 +3286,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGLineElement, nsIDOMSVGLineElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGLineElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3307,7 +3297,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGMaskElement, nsIDOMSVGMaskElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGMaskElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGUnitTypes)
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3319,14 +3308,12 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGPathElement, nsIDOMSVGPathElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGPathElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimatedPathData)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGPatternElement, nsIDOMSVGPatternElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGPatternElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFitToViewBox)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGUnitTypes)
@ -3335,14 +3322,12 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGPolygonElement, nsIDOMSVGPolygonElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGPolygonElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimatedPoints)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGPolylineElement, nsIDOMSVGPolylineElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGPolylineElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimatedPoints)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3358,7 +3343,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGRectElement, nsIDOMSVGRectElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGRectElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3383,14 +3367,12 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSVGElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFitToViewBox)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGLocatable)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGZoomAndPan)
DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGSwitchElement, nsIDOMSVGSwitchElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGSwitchElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3405,7 +3387,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGTextElement, nsIDOMSVGTextElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextPositioningElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTextContentElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
@ -3430,7 +3411,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_MAP_BEGIN(SVGUseElement, nsIDOMSVGUseElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGUseElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGTests)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END