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 847120: Remove nsIDOMSVGFilterPrimitiveStandardAttributes r=Ms2ger f=jwatt

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

39
content/svg/content/src/nsSVGFilters.cpp
View File

@ -12,7 +12,6 @@
#include "nsSVGInteger.h"
#include "nsSVGIntegerPair.h"
#include "nsSVGBoolean.h"
#include "nsIDOMSVGFilters.h"
#include "nsCOMPtr.h"
#include "nsSVGFilterInstance.h"
#include "nsSVGEnum.h"
@ -250,68 +249,30 @@ nsSVGFE::AttributeAffectsRendering(int32_t aNameSpaceID,
aAttribute == nsGkAtoms::result);
}
//----------------------------------------------------------------------
// nsIDOMSVGFilterPrimitiveStandardAttributes methods
/* readonly attribute nsIDOMSVGAnimatedLength x; */
NS_IMETHODIMP nsSVGFE::GetX(nsIDOMSVGAnimatedLength * *aX)
{
*aX = X().get();
return NS_OK;
}
already_AddRefed<SVGAnimatedLength>
nsSVGFE::X()
{
return mLengthAttributes[ATTR_X].ToDOMAnimatedLength(this);
}
/* readonly attribute nsIDOMSVGAnimatedLength y; */
NS_IMETHODIMP nsSVGFE::GetY(nsIDOMSVGAnimatedLength * *aY)
{
*aY = Y().get();
return NS_OK;
}
already_AddRefed<SVGAnimatedLength>
nsSVGFE::Y()
{
return mLengthAttributes[ATTR_Y].ToDOMAnimatedLength(this);
}
/* readonly attribute nsIDOMSVGAnimatedLength width; */
NS_IMETHODIMP nsSVGFE::GetWidth(nsIDOMSVGAnimatedLength * *aWidth)
{
*aWidth = Width().get();
return NS_OK;
}
already_AddRefed<SVGAnimatedLength>
nsSVGFE::Width()
{
return mLengthAttributes[ATTR_WIDTH].ToDOMAnimatedLength(this);
}
/* readonly attribute nsIDOMSVGAnimatedLength height; */
NS_IMETHODIMP nsSVGFE::GetHeight(nsIDOMSVGAnimatedLength * *aHeight)
{
*aHeight = Height().get();
return NS_OK;
}
already_AddRefed<SVGAnimatedLength>
nsSVGFE::Height()
{
return mLengthAttributes[ATTR_HEIGHT].ToDOMAnimatedLength(this);
}
/* readonly attribute nsIDOMSVGAnimatedString result; */
NS_IMETHODIMP nsSVGFE::GetResult(nsIDOMSVGAnimatedString * *aResult)
{
*aResult = Result().get();
return NS_OK;
}
already_AddRefed<nsIDOMSVGAnimatedString>
nsSVGFE::Result()
{

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

@ -8,7 +8,6 @@
#include "gfxImageSurface.h"
#include "gfxRect.h"
#include "nsIDOMSVGFilters.h"
#include "nsIFrame.h"
#include "nsImageLoadingContent.h"
#include "nsSVGLength2.h"
@ -54,7 +53,6 @@ typedef nsSVGElement nsSVGFEBase;
* derive from SVGFEUnstyledElement instead
*/
class nsSVGFE : public nsSVGFEBase
//, public nsIDOMSVGFilterPrimitiveStandardAttributes
{
friend class nsSVGFilterInstance;
@ -131,10 +129,9 @@ public:
virtual bool SubregionIsUnionOfRegions() { return true; }
NS_DECLARE_STATIC_IID_ACCESSOR(NS_SVG_FE_CID)
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDOMSVGFILTERPRIMITIVESTANDARDATTRIBUTES
// nsIContent interface
NS_IMETHOD_(bool) IsAttributeMapped(const nsIAtom* aAttribute) const;
@ -228,7 +225,6 @@ protected:
// nsSVGElement specializations:
virtual LengthAttributesInfo GetLengthInfo();
// nsIDOMSVGFitlerPrimitiveStandardAttributes values
enum { ATTR_X, ATTR_Y, ATTR_WIDTH, ATTR_HEIGHT };
nsSVGLength2 mLengthAttributes[4];
static LengthInfo sLengthInfo[4];
@ -263,9 +259,6 @@ public:
// interfaces:
NS_DECL_ISUPPORTS_INHERITED
// FE Base
NS_FORWARD_NSIDOMSVGFILTERPRIMITIVESTANDARDATTRIBUTES(nsSVGFELightingElementBase::)
virtual nsresult Filter(nsSVGFilterInstance* aInstance,
const nsTArray<const Image*>& aSources,
const Image* aTarget,

1
dom/base/nsDOMClassInfo.cpp
View File

@ -255,7 +255,6 @@
#include "nsIDOMTimeEvent.h"
#include "nsIDOMSVGDocument.h"
#include "nsIDOMSVGElement.h"
#include "nsIDOMSVGFilters.h"
#include "nsIDOMSVGLength.h"
#include "nsIDOMSVGNumber.h"
#include "nsIDOMSVGRect.h"

1
dom/interfaces/svg/moz.build
View File

@ -13,7 +13,6 @@ XPIDL_SOURCES += [
'nsIDOMSVGAnimatedString.idl',
'nsIDOMSVGDocument.idl',
'nsIDOMSVGElement.idl',
'nsIDOMSVGFilters.idl',
'nsIDOMSVGLength.idl',
'nsIDOMSVGNumber.idl',
'nsIDOMSVGRect.idl',

22
dom/interfaces/svg/nsIDOMSVGFilters.idl
View File

@ -1,22 +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;
interface nsIDOMSVGAnimatedString;
interface nsIDOMSVGAnimatedNumber;
interface nsIDOMSVGAnimatedEnumeration;
interface nsIDOMSVGAnimatedInteger;
[scriptable, uuid(d53cce38-2b96-4803-9ca0-0310becd6873)]
interface nsIDOMSVGFilterPrimitiveStandardAttributes : nsIDOMSVGElement
{
readonly attribute nsIDOMSVGAnimatedLength x;
readonly attribute nsIDOMSVGAnimatedLength y;
readonly attribute nsIDOMSVGAnimatedLength width;
readonly attribute nsIDOMSVGAnimatedLength height;
readonly attribute nsIDOMSVGAnimatedString result;
};

1
layout/base/nsCSSFrameConstructor.cpp
View File

@ -115,7 +115,6 @@
#undef NOISY_FIRST_LETTER
#include "nsMathMLParts.h"
#include "nsIDOMSVGFilters.h"
#include "mozilla/dom/SVGTests.h"
#include "nsSVGEffects.h"
#include "nsSVGTextFrame2.h"