Bug 833446: Remove nsIDOMSVGClipPathElement r=peterv

This commit is contained in:
David Zbarsky 2013-02-08 14:55:52 -05:00
parent 0cf58650c2
commit 5de506372b
6 changed files with 5 additions and 74 deletions

View File

@ -11,8 +11,6 @@
NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(ClipPath)
DOMCI_NODE_DATA(SVGClipPathElement, mozilla::dom::SVGClipPathElement)
namespace mozilla {
namespace dom {
@ -33,16 +31,10 @@ nsSVGElement::EnumInfo SVGClipPathElement::sEnumInfo[1] =
//----------------------------------------------------------------------
// nsISupports methods
NS_IMPL_ADDREF_INHERITED(SVGClipPathElement,SVGClipPathElementBase)
NS_IMPL_RELEASE_INHERITED(SVGClipPathElement,SVGClipPathElementBase)
NS_INTERFACE_TABLE_HEAD(SVGClipPathElement)
NS_NODE_INTERFACE_TABLE5(SVGClipPathElement, nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGClipPathElement,
nsIDOMSVGUnitTypes)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGClipPathElement)
NS_INTERFACE_MAP_END_INHERITING(SVGClipPathElementBase)
NS_IMPL_ISUPPORTS_INHERITED4(SVGClipPathElement, SVGClipPathElementBase,
nsIDOMNode, nsIDOMElement,
nsIDOMSVGElement,
nsIDOMSVGUnitTypes)
//----------------------------------------------------------------------
// Implementation
@ -53,13 +45,6 @@ SVGClipPathElement::SVGClipPathElement(already_AddRefed<nsINodeInfo> aNodeInfo)
SetIsDOMBinding();
}
/* readonly attribute nsIDOMSVGAnimatedEnumeration clipPathUnits; */
NS_IMETHODIMP SVGClipPathElement::GetClipPathUnits(nsIDOMSVGAnimatedEnumeration * *aClipPathUnits)
{
*aClipPathUnits = ClipPathUnits().get();
return NS_OK;
}
already_AddRefed<nsIDOMSVGAnimatedEnumeration>
SVGClipPathElement::ClipPathUnits()
{

View File

@ -6,7 +6,6 @@
#ifndef mozilla_dom_SVGClipPathElement_h
#define mozilla_dom_SVGClipPathElement_h
#include "nsIDOMSVGClipPathElement.h"
#include "nsIDOMSVGUnitTypes.h"
#include "nsSVGEnum.h"
#include "mozilla/dom/SVGTransformableElement.h"
@ -22,7 +21,7 @@ namespace dom {
typedef SVGTransformableElement SVGClipPathElementBase;
class SVGClipPathElement MOZ_FINAL : public SVGClipPathElementBase,
public nsIDOMSVGClipPathElement,
public nsIDOMSVGElement,
public nsIDOMSVGUnitTypes
{
friend class ::nsSVGClipPathFrame;
@ -37,7 +36,6 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDOMSVGCLIPPATHELEMENT
// xxx I wish we could use virtual inheritance
NS_FORWARD_NSIDOMNODE_TO_NSINODE
@ -46,8 +44,6 @@ public:
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
virtual nsXPCClassInfo* GetClassInfo();
virtual nsIDOMNode* AsDOMNode() { return this; }
// WebIDL
@ -55,7 +51,6 @@ public:
protected:
// nsIDOMSVGClipPathElement values
enum { CLIPPATHUNITS };
nsSVGEnum mEnumAttributes[1];
static EnumInfo sEnumInfo[1];

View File

@ -317,7 +317,6 @@
#include "nsIDOMSVGAnimatedRect.h"
#include "nsIDOMSVGAnimatedString.h"
#include "nsIDOMTimeEvent.h"
#include "nsIDOMSVGClipPathElement.h"
#include "nsIDOMSVGDocument.h"
#include "nsIDOMSVGElement.h"
#include "nsIDOMSVGEvent.h"
@ -1027,8 +1026,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
ELEMENT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(TimeEvent, nsDOMGenericSH,
DOM_DEFAULT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(SVGClipPathElement, nsElementSH,
ELEMENT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(SVGFEBlendElement, nsElementSH,
ELEMENT_SCRIPTABLE_FLAGS)
NS_DEFINE_CLASSINFO_DATA(SVGFEColorMatrixElement, nsElementSH,
@ -2882,12 +2879,6 @@ nsDOMClassInfo::Init()
DOM_CLASSINFO_EVENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGClipPathElement, nsIDOMSVGClipPathElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGClipPathElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGUnitTypes)
DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
DOM_CLASSINFO_MAP_END
DOM_CLASSINFO_MAP_BEGIN(SVGFEBlendElement, nsIDOMSVGFEBlendElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFEBlendElement)
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGFilterPrimitiveStandardAttributes)

View File

@ -193,7 +193,6 @@ DOMCI_CLASS(SVGDocument)
// SVG element classes
DOMCI_CLASS(SVGAElement)
DOMCI_CLASS(TimeEvent)
DOMCI_CLASS(SVGClipPathElement)
DOMCI_CLASS(SVGFEBlendElement)
DOMCI_CLASS(SVGFEColorMatrixElement)
DOMCI_CLASS(SVGFEComponentTransferElement)

View File

@ -24,7 +24,6 @@ XPIDLSRCS = \
nsIDOMSVGAnimatedNumber.idl \
nsIDOMSVGAnimatedRect.idl \
nsIDOMSVGAnimatedString.idl \
nsIDOMSVGClipPathElement.idl \
nsIDOMSVGDocument.idl \
nsIDOMSVGElement.idl \
nsIDOMSVGEvent.idl \

View File

@ -1,38 +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"
/**
* The nsIDOMSVGClipPathElement interface is the interface to an SVG
* clipPath element.
*
* For more information on this interface please see
* http://www.w3.org/TR/SVG11/masking.html
*
*/
interface nsIDOMSVGAnimatedEnumeration;
[scriptable, uuid(5A4D77E5-D887-4050-A9F7-0D690AD35500)]
interface nsIDOMSVGClipPathElement
: 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,
*/
{
readonly attribute nsIDOMSVGAnimatedEnumeration clipPathUnits;
};