mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 833446: Remove nsIDOMSVGCircleElement r=peterv
This commit is contained in:
David Zbarsky
parent
0a767db57e
commit
fdfb2eb1eb
@ -9,8 +9,6 @@
|
||||
#include "mozilla/dom/SVGAnimatedLength.h"
|
||||
#include "mozilla/dom/SVGCircleElementBinding.h"
|
||||
|
||||
DOMCI_NODE_DATA(SVGCircleElement, mozilla::dom::SVGCircleElement)
|
||||
|
||||
NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Circle)
|
||||
|
||||
namespace mozilla {
|
||||
@ -32,15 +30,9 @@ nsSVGElement::LengthInfo SVGCircleElement::sLengthInfo[3] =
|
||||
//----------------------------------------------------------------------
|
||||
// nsISupports methods
|
||||
|
||||
NS_IMPL_ADDREF_INHERITED(SVGCircleElement,SVGCircleElementBase)
|
||||
NS_IMPL_RELEASE_INHERITED(SVGCircleElement,SVGCircleElementBase)
|
||||
|
||||
NS_INTERFACE_TABLE_HEAD(SVGCircleElement)
|
||||
NS_NODE_INTERFACE_TABLE4(SVGCircleElement, nsIDOMNode, nsIDOMElement,
|
||||
nsIDOMSVGElement,
|
||||
nsIDOMSVGCircleElement)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGCircleElement)
|
||||
NS_INTERFACE_MAP_END_INHERITING(SVGCircleElementBase)
|
||||
NS_IMPL_ISUPPORTS_INHERITED3(SVGCircleElement, SVGCircleElementBase,
|
||||
nsIDOMNode, nsIDOMElement,
|
||||
nsIDOMSVGElement)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// Implementation
|
||||
@ -57,14 +49,6 @@ SVGCircleElement::SVGCircleElement(already_AddRefed<nsINodeInfo> aNodeInfo)
|
||||
NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGCircleElement)
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
// nsIDOMSVGCircleElement methods
|
||||
|
||||
/* readonly attribute nsIDOMSVGAnimatedLength cx; */
|
||||
NS_IMETHODIMP SVGCircleElement::GetCx(nsIDOMSVGAnimatedLength * *aCx)
|
||||
{
|
||||
*aCx = Cx().get();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
already_AddRefed<SVGAnimatedLength>
|
||||
SVGCircleElement::Cx()
|
||||
@ -72,26 +56,12 @@ SVGCircleElement::Cx()
|
||||
return mLengthAttributes[ATTR_CX].ToDOMAnimatedLength(this);
|
||||
}
|
||||
|
||||
/* readonly attribute nsIDOMSVGAnimatedLength cy; */
|
||||
NS_IMETHODIMP SVGCircleElement::GetCy(nsIDOMSVGAnimatedLength * *aCy)
|
||||
{
|
||||
*aCy = Cy().get();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
already_AddRefed<SVGAnimatedLength>
|
||||
SVGCircleElement::Cy()
|
||||
{
|
||||
return mLengthAttributes[ATTR_CY].ToDOMAnimatedLength(this);
|
||||
}
|
||||
|
||||
/* readonly attribute nsIDOMSVGAnimatedLength r; */
|
||||
NS_IMETHODIMP SVGCircleElement::GetR(nsIDOMSVGAnimatedLength * *aR)
|
||||
{
|
||||
*aR = R().get();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
already_AddRefed<SVGAnimatedLength>
|
||||
SVGCircleElement::R()
|
||||
{
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
#define mozilla_dom_SVGCircleElement_h
|
||||
|
||||
#include "nsSVGPathGeometryElement.h"
|
||||
#include "nsIDOMSVGCircleElement.h"
|
||||
#include "nsSVGLength2.h"
|
||||
|
||||
nsresult NS_NewSVGCircleElement(nsIContent **aResult,
|
||||
@ -19,7 +18,7 @@ namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class SVGCircleElement MOZ_FINAL : public SVGCircleElementBase,
|
||||
public nsIDOMSVGCircleElement
|
||||
public nsIDOMSVGElement
|
||||
{
|
||||
protected:
|
||||
SVGCircleElement(already_AddRefed<nsINodeInfo> aNodeInfo);
|
||||
@ -30,7 +29,6 @@ protected:
|
||||
public:
|
||||
// interfaces:
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_DECL_NSIDOMSVGCIRCLEELEMENT
|
||||
|
||||
// xxx I wish we could use virtual inheritance
|
||||
NS_FORWARD_NSIDOMNODE_TO_NSINODE
|
||||
@ -45,8 +43,6 @@ public:
|
||||
|
||||
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
|
||||
|
||||
virtual nsXPCClassInfo* GetClassInfo();
|
||||
|
||||
virtual nsIDOMNode* AsDOMNode() { return this; }
|
||||
|
||||
// WebIDL
|
||||
|
||||
@ -318,7 +318,6 @@
|
||||
#include "nsIDOMSVGAnimatedString.h"
|
||||
#include "nsIDOMSVGMpathElement.h"
|
||||
#include "nsIDOMTimeEvent.h"
|
||||
#include "nsIDOMSVGCircleElement.h"
|
||||
#include "nsIDOMSVGClipPathElement.h"
|
||||
#include "nsIDOMSVGDefsElement.h"
|
||||
#include "nsIDOMSVGDescElement.h"
|
||||
@ -1070,8 +1069,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
|
||||
ELEMENT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(TimeEvent, nsDOMGenericSH,
|
||||
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGCircleElement, nsElementSH,
|
||||
ELEMENT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGClipPathElement, nsElementSH,
|
||||
ELEMENT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGDefsElement, nsElementSH,
|
||||
@ -3008,11 +3005,6 @@ nsDOMClassInfo::Init()
|
||||
DOM_CLASSINFO_EVENT_MAP_ENTRIES
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
||||
DOM_CLASSINFO_MAP_BEGIN(SVGCircleElement, nsIDOMSVGCircleElement)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGCircleElement)
|
||||
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(nsIDOMSVGUnitTypes)
|
||||
|
||||
@ -194,7 +194,6 @@ DOMCI_CLASS(SVGDocument)
|
||||
DOMCI_CLASS(SVGAElement)
|
||||
DOMCI_CLASS(SVGMpathElement)
|
||||
DOMCI_CLASS(TimeEvent)
|
||||
DOMCI_CLASS(SVGCircleElement)
|
||||
DOMCI_CLASS(SVGClipPathElement)
|
||||
DOMCI_CLASS(SVGDefsElement)
|
||||
DOMCI_CLASS(SVGDescElement)
|
||||
|
||||
@ -24,7 +24,6 @@ XPIDLSRCS = \
|
||||
nsIDOMSVGAnimatedNumber.idl \
|
||||
nsIDOMSVGAnimatedRect.idl \
|
||||
nsIDOMSVGAnimatedString.idl \
|
||||
nsIDOMSVGCircleElement.idl \
|
||||
nsIDOMSVGClipPathElement.idl \
|
||||
nsIDOMSVGDefsElement.idl \
|
||||
nsIDOMSVGDescElement.idl \
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "nsIDOMSVGElement.idl"
|
||||
|
||||
interface nsIDOMSVGAnimatedLength;
|
||||
|
||||
[scriptable, uuid(150C9D2F-66D1-4EC4-A351-4F53534FA314)]
|
||||
interface nsIDOMSVGCircleElement
|
||||
: nsIDOMSVGElement
|
||||
/*
|
||||
The SVG DOM makes use of multiple interface inheritance.
|
||||
Since XPCOM only supports single interface inheritance,
|
||||
the best thing that we can do is to promise that whenever
|
||||
an object implements _this_ interface it will also
|
||||
implement the following interfaces. (We then have to QI to
|
||||
hop between them.)
|
||||
|
||||
nsIDOMSVGTests,
|
||||
nsIDOMSVGLangSpace,
|
||||
nsIDOMSVGExternalResourcesRequired,
|
||||
nsIDOMSVGStylable,
|
||||
nsIDOMSVGTransformable,
|
||||
events::nsIDOMEventTarget
|
||||
*/
|
||||
{
|
||||
readonly attribute nsIDOMSVGAnimatedLength cx;
|
||||
readonly attribute nsIDOMSVGAnimatedLength cy;
|
||||
readonly attribute nsIDOMSVGAnimatedLength r;
|
||||
};
|
||||
Loading…
Reference in New Issue
Block a user