author | longsonr <longsonr@gmail.com> |
Fri, 21 Dec 2018 16:24:17 +0000 | |
changeset 451715 | 9382786d8bae1973dbecfece8f64be9ff641b5cb |
parent 451714 | abff637283c5ed716c2fe2ee61e56bb7b10983ba |
child 451716 | 78e69c0b9293e493b1ecbb66b964d2411f7acada |
push id | 35252 |
push user | ccoroiu@mozilla.com |
push date | Fri, 21 Dec 2018 21:56:22 +0000 |
treeherder | mozilla-central@b23630094b9c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dholbert |
bugs | 1515936 |
milestone | 66.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/svg/SVGComponentTransferFunctionElement.h +++ b/dom/svg/SVGComponentTransferFunctionElement.h @@ -3,17 +3,17 @@ /* 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/. */ #ifndef mozilla_dom_SVGComponentTransferFunctionElement_h #define mozilla_dom_SVGComponentTransferFunctionElement_h #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" #include "SVGAnimatedNumberList.h" #define NS_SVG_FE_COMPONENT_TRANSFER_FUNCTION_ELEMENT_CID \ { \ 0xafab106d, 0xbc18, 0x4f7f, { \ 0x9e, 0x29, 0xfe, 0xb4, 0xb0, 0x16, 0x5f, 0xf4 \ } \
--- a/dom/svg/SVGFEBlendElement.cpp +++ b/dom/svg/SVGFEBlendElement.cpp @@ -81,20 +81,19 @@ bool SVGFEBlendElement::AttributeAffects nsAtom* aAttribute) const { return SVGFEBlendElementBase::AttributeAffectsRendering(aNameSpaceID, aAttribute) || (aNameSpaceID == kNameSpaceID_None && (aAttribute == nsGkAtoms::in || aAttribute == nsGkAtoms::in2 || aAttribute == nsGkAtoms::mode)); } -void SVGFEBlendElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN2], this)); +void SVGFEBlendElement::GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN2], this)); } //---------------------------------------------------------------------- // SVGElement methods SVGElement::EnumAttributesInfo SVGFEBlendElement::GetEnumInfo() { return EnumAttributesInfo(mEnumAttributes, sEnumInfo, ArrayLength(sEnumInfo)); }
--- a/dom/svg/SVGFEBlendElement.h +++ b/dom/svg/SVGFEBlendElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEBlendElement_h #define mozilla_dom_SVGFEBlendElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGEnum.h" nsresult NS_NewSVGFEBlendElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFE SVGFEBlendElementBase; @@ -34,18 +34,17 @@ class SVGFEBlendElement : public SVGFEBl nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedString> In2(); already_AddRefed<SVGAnimatedEnumeration> Mode();
--- a/dom/svg/SVGFEColorMatrixElement.cpp +++ b/dom/svg/SVGFEColorMatrixElement.cpp @@ -56,18 +56,18 @@ already_AddRefed<SVGAnimatedEnumeration> } already_AddRefed<DOMSVGAnimatedNumberList> SVGFEColorMatrixElement::Values() { return DOMSVGAnimatedNumberList::GetDOMWrapper(&mNumberListAttributes[VALUES], this, VALUES); } void SVGFEColorMatrixElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } FilterPrimitiveDescription SVGFEColorMatrixElement::GetPrimitiveDescription( nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) { uint32_t type = mEnumAttributes[TYPE].GetAnimValue(); const SVGNumberList& values = mNumberListAttributes[VALUES].GetAnimValue();
--- a/dom/svg/SVGFEColorMatrixElement.h +++ b/dom/svg/SVGFEColorMatrixElement.h @@ -3,17 +3,17 @@ /* 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/. */ #ifndef mozilla_dom_SVGFEColorMatrixElement_h #define mozilla_dom_SVGFEColorMatrixElement_h #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "SVGAnimatedNumberList.h" nsresult NS_NewSVGFEColorMatrixElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { @@ -36,18 +36,17 @@ class SVGFEColorMatrixElement : public S nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedEnumeration> Type(); already_AddRefed<DOMSVGAnimatedNumberList> Values();
--- a/dom/svg/SVGFEComponentTransferElement.cpp +++ b/dom/svg/SVGFEComponentTransferElement.cpp @@ -79,14 +79,14 @@ SVGFEComponentTransferElement::GetPrimit bool SVGFEComponentTransferElement::AttributeAffectsRendering( int32_t aNameSpaceID, nsAtom* aAttribute) const { return SVGFEComponentTransferElementBase::AttributeAffectsRendering( aNameSpaceID, aAttribute) || (aNameSpaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::in); } void SVGFEComponentTransferElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } } // namespace dom } // namespace mozilla
--- a/dom/svg/SVGFEComponentTransferElement.h +++ b/dom/svg/SVGFEComponentTransferElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEComponentTransferElement_h #define mozilla_dom_SVGFEComponentTransferElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFEComponentTransferElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFE SVGFEComponentTransferElementBase; @@ -34,18 +34,17 @@ class SVGFEComponentTransferElement : pu nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; // nsIContent virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); protected:
--- a/dom/svg/SVGFECompositeElement.cpp +++ b/dom/svg/SVGFECompositeElement.cpp @@ -106,19 +106,19 @@ bool SVGFECompositeElement::AttributeAff (aNameSpaceID == kNameSpaceID_None && (aAttribute == nsGkAtoms::in || aAttribute == nsGkAtoms::in2 || aAttribute == nsGkAtoms::k1 || aAttribute == nsGkAtoms::k2 || aAttribute == nsGkAtoms::k3 || aAttribute == nsGkAtoms::k4 || aAttribute == nsGkAtoms::_operator)); } void SVGFECompositeElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN2], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN2], this)); } //---------------------------------------------------------------------- // SVGElement methods SVGElement::NumberAttributesInfo SVGFECompositeElement::GetNumberInfo() { return NumberAttributesInfo(mNumberAttributes, sNumberInfo, ArrayLength(sNumberInfo));
--- a/dom/svg/SVGFECompositeElement.h +++ b/dom/svg/SVGFECompositeElement.h @@ -3,17 +3,17 @@ /* 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/. */ #ifndef mozilla_dom_SVGFECompositeElement_h #define mozilla_dom_SVGFECompositeElement_h #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" nsresult NS_NewSVGFECompositeElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { @@ -36,18 +36,17 @@ class SVGFECompositeElement : public SVG nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedString> In2(); already_AddRefed<SVGAnimatedEnumeration> Operator(); already_AddRefed<SVGAnimatedNumber> K1();
--- a/dom/svg/SVGFEConvolveMatrixElement.cpp +++ b/dom/svg/SVGFEConvolveMatrixElement.cpp @@ -116,18 +116,18 @@ SVGFEConvolveMatrixElement::KernelUnitLe already_AddRefed<SVGAnimatedNumber> SVGFEConvolveMatrixElement::KernelUnitLengthY() { return mNumberPairAttributes[KERNEL_UNIT_LENGTH].ToDOMAnimatedNumber( nsSVGNumberPair::eSecond, this); } void SVGFEConvolveMatrixElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } FilterPrimitiveDescription SVGFEConvolveMatrixElement::GetPrimitiveDescription( nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) { FilterPrimitiveDescription failureDescription;
--- a/dom/svg/SVGFEConvolveMatrixElement.h +++ b/dom/svg/SVGFEConvolveMatrixElement.h @@ -4,17 +4,17 @@ * 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/. */ #ifndef mozilla_dom_SVGFEConvolveMatrixElement_h #define mozilla_dom_SVGFEConvolveMatrixElement_h #include "nsSVGBoolean.h" #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGInteger.h" #include "nsSVGIntegerPair.h" #include "nsSVGNumber2.h" #include "nsSVGString.h" #include "SVGAnimatedNumberList.h" nsresult NS_NewSVGFEConvolveMatrixElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); @@ -44,18 +44,17 @@ class SVGFEConvolveMatrixElement : publi nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedInteger> OrderX(); already_AddRefed<SVGAnimatedInteger> OrderY(); already_AddRefed<DOMSVGAnimatedNumberList> KernelMatrix();
--- a/dom/svg/SVGFEDiffuseLightingElement.h +++ b/dom/svg/SVGFEDiffuseLightingElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEDiffuseLightingElement_h #define mozilla_dom_SVGFEDiffuseLightingElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFEDiffuseLightingElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFELightingElement SVGFEDiffuseLightingElementBase;
--- a/dom/svg/SVGFEDisplacementMapElement.cpp +++ b/dom/svg/SVGFEDisplacementMapElement.cpp @@ -100,19 +100,19 @@ bool SVGFEDisplacementMapElement::Attrib (aNameSpaceID == kNameSpaceID_None && (aAttribute == nsGkAtoms::in || aAttribute == nsGkAtoms::in2 || aAttribute == nsGkAtoms::scale || aAttribute == nsGkAtoms::xChannelSelector || aAttribute == nsGkAtoms::yChannelSelector)); } void SVGFEDisplacementMapElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN2], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN2], this)); } //---------------------------------------------------------------------- // SVGElement methods SVGElement::NumberAttributesInfo SVGFEDisplacementMapElement::GetNumberInfo() { return NumberAttributesInfo(mNumberAttributes, sNumberInfo, ArrayLength(sNumberInfo));
--- a/dom/svg/SVGFEDisplacementMapElement.h +++ b/dom/svg/SVGFEDisplacementMapElement.h @@ -3,17 +3,17 @@ /* 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/. */ #ifndef mozilla_dom_SVGFEDisplacementMapElement_h #define mozilla_dom_SVGFEDisplacementMapElement_h #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFEDisplacementMapElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFE SVGFEDisplacementMapElementBase; @@ -34,18 +34,17 @@ class SVGFEDisplacementMapElement : publ nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedString> In2(); already_AddRefed<SVGAnimatedNumber> Scale(); already_AddRefed<SVGAnimatedEnumeration> XChannelSelector();
--- a/dom/svg/SVGFEDistantLightElement.h +++ b/dom/svg/SVGFEDistantLightElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEDistantLightElement_h #define mozilla_dom_SVGFEDistantLightElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" nsresult NS_NewSVGFEDistantLightElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom {
--- a/dom/svg/SVGFEDropShadowElement.cpp +++ b/dom/svg/SVGFEDropShadowElement.cpp @@ -107,18 +107,18 @@ bool SVGFEDropShadowElement::AttributeAf aAttribute) || (aNameSpaceID == kNameSpaceID_None && (aAttribute == nsGkAtoms::in || aAttribute == nsGkAtoms::stdDeviation || aAttribute == nsGkAtoms::dx || aAttribute == nsGkAtoms::dy)); } void SVGFEDropShadowElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } //---------------------------------------------------------------------- // nsIContent methods NS_IMETHODIMP_(bool) SVGFEDropShadowElement::IsAttributeMapped(const nsAtom* name) const { static const MappedAttributeEntry* const map[] = {sFEFloodMap};
--- a/dom/svg/SVGFEDropShadowElement.h +++ b/dom/svg/SVGFEDropShadowElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEDropShadowElement_h #define mozilla_dom_SVGFEDropShadowElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" #include "nsSVGNumberPair.h" #include "nsSVGString.h" nsresult NS_NewSVGFEDropShadowElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { @@ -37,18 +37,17 @@ class SVGFEDropShadowElement : public SV nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; // nsIContent interface NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1();
--- a/dom/svg/SVGFEFloodElement.h +++ b/dom/svg/SVGFEFloodElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEFloodElement_h #define mozilla_dom_SVGFEFloodElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFEFloodElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFE SVGFEFloodElementBase;
--- a/dom/svg/SVGFEGaussianBlurElement.cpp +++ b/dom/svg/SVGFEGaussianBlurElement.cpp @@ -79,18 +79,18 @@ bool SVGFEGaussianBlurElement::Attribute return SVGFEGaussianBlurElementBase::AttributeAffectsRendering(aNameSpaceID, aAttribute) || (aNameSpaceID == kNameSpaceID_None && (aAttribute == nsGkAtoms::in || aAttribute == nsGkAtoms::stdDeviation)); } void SVGFEGaussianBlurElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } //---------------------------------------------------------------------- // SVGElement methods SVGElement::NumberPairAttributesInfo SVGFEGaussianBlurElement::GetNumberPairInfo() { return NumberPairAttributesInfo(mNumberPairAttributes, sNumberPairInfo,
--- a/dom/svg/SVGFEGaussianBlurElement.h +++ b/dom/svg/SVGFEGaussianBlurElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEGaussianBlurElement_h #define mozilla_dom_SVGFEGaussianBlurElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumberPair.h" #include "nsSVGString.h" nsresult NS_NewSVGFEGaussianBlurElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { @@ -36,18 +36,17 @@ class SVGFEGaussianBlurElement : public nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedNumber> StdDeviationX(); already_AddRefed<SVGAnimatedNumber> StdDeviationY(); void SetStdDeviation(float stdDeviationX, float stdDeviationY);
--- a/dom/svg/SVGFEImageElement.h +++ b/dom/svg/SVGFEImageElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEImageElement_h #define mozilla_dom_SVGFEImageElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "SVGAnimatedPreserveAspectRatio.h" class SVGFEImageFrame; nsresult NS_NewSVGFEImageElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla {
--- a/dom/svg/SVGFEMergeElement.cpp +++ b/dom/svg/SVGFEMergeElement.cpp @@ -27,23 +27,22 @@ NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEMer FilterPrimitiveDescription SVGFEMergeElement::GetPrimitiveDescription( nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) { return FilterPrimitiveDescription(AsVariant(MergeAttributes())); } -void SVGFEMergeElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { +void SVGFEMergeElement::GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) { for (nsIContent* child = nsINode::GetFirstChild(); child; child = child->GetNextSibling()) { if (child->IsSVGElement(nsGkAtoms::feMergeNode)) { SVGFEMergeNodeElement* node = static_cast<SVGFEMergeNodeElement*>(child); - aSources.AppendElement(nsSVGStringInfo(node->GetIn1(), node)); + aSources.AppendElement(SVGStringInfo(node->GetIn1(), node)); } } } //---------------------------------------------------------------------- // SVGElement methods SVGElement::StringAttributesInfo SVGFEMergeElement::GetStringInfo() {
--- a/dom/svg/SVGFEMergeElement.h +++ b/dom/svg/SVGFEMergeElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEMergeElement_h #define mozilla_dom_SVGFEMergeElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFEMergeElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFE SVGFEMergeElementBase; @@ -32,18 +32,17 @@ class SVGFEMergeElement : public SVGFEMe public: virtual FilterPrimitiveDescription GetPrimitiveDescription( nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; // nsIContent virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; protected: virtual StringAttributesInfo GetStringInfo() override; enum { RESULT };
--- a/dom/svg/SVGFEMergeNodeElement.h +++ b/dom/svg/SVGFEMergeNodeElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEMergeNodeElement_h #define mozilla_dom_SVGFEMergeNodeElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFEMergeNodeElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFEUnstyledElement SVGFEMergeNodeElementBase;
--- a/dom/svg/SVGFEMorphologyElement.cpp +++ b/dom/svg/SVGFEMorphologyElement.cpp @@ -61,18 +61,18 @@ already_AddRefed<SVGAnimatedNumber> SVGF nsSVGNumberPair::eSecond, this); } void SVGFEMorphologyElement::SetRadius(float rx, float ry) { mNumberPairAttributes[RADIUS].SetBaseValues(rx, ry, this); } void SVGFEMorphologyElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } #define MORPHOLOGY_EPSILON 0.0001 void SVGFEMorphologyElement::GetRXY(int32_t* aRX, int32_t* aRY, const nsSVGFilterInstance& aInstance) { // Subtract an epsilon here because we don't want a value that's just // slightly larger than an integer to round up to the next integer; it's
--- a/dom/svg/SVGFEMorphologyElement.h +++ b/dom/svg/SVGFEMorphologyElement.h @@ -3,17 +3,17 @@ /* 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/. */ #ifndef mozilla_dom_SVGFEMorphologyElement_h #define mozilla_dom_SVGFEMorphologyElement_h #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumberPair.h" #include "nsSVGString.h" nsresult NS_NewSVGFEMorphologyElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { @@ -37,18 +37,17 @@ class SVGFEMorphologyElement : public SV nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedEnumeration> Operator(); already_AddRefed<SVGAnimatedNumber> RadiusX(); already_AddRefed<SVGAnimatedNumber> RadiusY();
--- a/dom/svg/SVGFEOffsetElement.cpp +++ b/dom/svg/SVGFEOffsetElement.cpp @@ -64,18 +64,18 @@ bool SVGFEOffsetElement::AttributeAffect return SVGFEOffsetElementBase::AttributeAffectsRendering(aNameSpaceID, aAttribute) || (aNameSpaceID == kNameSpaceID_None && (aAttribute == nsGkAtoms::in || aAttribute == nsGkAtoms::dx || aAttribute == nsGkAtoms::dy)); } void SVGFEOffsetElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } //---------------------------------------------------------------------- // SVGElement methods SVGElement::NumberAttributesInfo SVGFEOffsetElement::GetNumberInfo() { return NumberAttributesInfo(mNumberAttributes, sNumberInfo, ArrayLength(sNumberInfo));
--- a/dom/svg/SVGFEOffsetElement.h +++ b/dom/svg/SVGFEOffsetElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEOffsetElement_h #define mozilla_dom_SVGFEOffsetElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" #include "nsSVGString.h" nsresult NS_NewSVGFEOffsetElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { @@ -36,18 +36,17 @@ class SVGFEOffsetElement : public SVGFEO nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); already_AddRefed<SVGAnimatedNumber> Dx(); already_AddRefed<SVGAnimatedNumber> Dy();
--- a/dom/svg/SVGFEPointLightElement.h +++ b/dom/svg/SVGFEPointLightElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFEPointLightElement_h #define mozilla_dom_SVGFEPointLightElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" nsresult NS_NewSVGFEPointLightElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom {
--- a/dom/svg/SVGFESpecularLightingElement.h +++ b/dom/svg/SVGFESpecularLightingElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFESpecularLightingElement_h #define mozilla_dom_SVGFESpecularLightingElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFESpecularLightingElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { //---------------------SpecularLighting------------------------
--- a/dom/svg/SVGFESpotLightElement.h +++ b/dom/svg/SVGFESpotLightElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFESpotLightElement_h #define mozilla_dom_SVGFESpotLightElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" nsresult NS_NewSVGFESpotLightElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom {
--- a/dom/svg/SVGFETileElement.cpp +++ b/dom/svg/SVGFETileElement.cpp @@ -28,19 +28,18 @@ SVGElement::StringInfo SVGFETileElement: // nsINode methods NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFETileElement) already_AddRefed<SVGAnimatedString> SVGFETileElement::In1() { return mStringAttributes[IN1].ToDOMAnimatedString(this); } -void SVGFETileElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); +void SVGFETileElement::GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } //---------------------------------------------------------------------- // SVGElement methods FilterPrimitiveDescription SVGFETileElement::GetPrimitiveDescription( nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted,
--- a/dom/svg/SVGFETileElement.h +++ b/dom/svg/SVGFETileElement.h @@ -2,17 +2,17 @@ /* vim: set ts=8 sts=2 et sw=2 tw=80: */ /* 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/. */ #ifndef mozilla_dom_SVGFETileElement_h #define mozilla_dom_SVGFETileElement_h -#include "nsSVGFilters.h" +#include "SVGFilters.h" nsresult NS_NewSVGFETileElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla { namespace dom { typedef SVGFE SVGFETileElementBase; @@ -36,18 +36,17 @@ class SVGFETileElement : public SVGFETil nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) override; virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; virtual nsresult Clone(dom::NodeInfo*, nsINode** aResult) const override; // WebIDL already_AddRefed<SVGAnimatedString> In1(); protected: virtual StringAttributesInfo GetStringInfo() override;
--- a/dom/svg/SVGFETurbulenceElement.h +++ b/dom/svg/SVGFETurbulenceElement.h @@ -3,17 +3,17 @@ /* 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/. */ #ifndef mozilla_dom_SVGFETurbulenceElement_h #define mozilla_dom_SVGFETurbulenceElement_h #include "nsSVGEnum.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" #include "nsSVGInteger.h" #include "nsSVGString.h" nsresult NS_NewSVGFETurbulenceElement( nsIContent** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo); namespace mozilla {
rename from dom/svg/nsSVGFilters.cpp rename to dom/svg/SVGFilters.cpp --- a/dom/svg/nsSVGFilters.cpp +++ b/dom/svg/SVGFilters.cpp @@ -14,17 +14,17 @@ #include "nsSVGIntegerPair.h" #include "nsSVGBoolean.h" #include "nsCOMPtr.h" #include "nsSVGFilterInstance.h" #include "nsSVGEnum.h" #include "SVGNumberList.h" #include "SVGAnimatedNumberList.h" #include "DOMSVGAnimatedNumberList.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsLayoutUtils.h" #include "nsSVGUtils.h" #include "mozilla/ComputedStyle.h" #include "nsIFrame.h" #include "imgIContainer.h" #include "mozilla/dom/SVGFilterElement.h" #include "nsSVGString.h" #include "SVGContentUtils.h" @@ -70,17 +70,17 @@ NS_IMPL_RELEASE_INHERITED(SVGFE, SVGFEBa NS_INTERFACE_MAP_BEGIN(SVGFE) NS_INTERFACE_MAP_ENTRY_CONCRETE(SVGFE) NS_INTERFACE_MAP_END_INHERITING(SVGFEBase) //---------------------------------------------------------------------- // Implementation -void SVGFE::GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources) {} +void SVGFE::GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) {} bool SVGFE::OutputIsTainted(const nsTArray<bool>& aInputsAreTainted, nsIPrincipal* aReferencePrincipal) { // This is the default implementation for OutputIsTainted. // Our output is tainted if we have at least one tainted input. for (uint32_t i = 0; i < aInputsAreTainted.Length(); i++) { if (aInputsAreTainted[i]) { return true; @@ -393,18 +393,18 @@ SVGFELightingElement::IsAttributeMapped( static const MappedAttributeEntry* const map[] = {sColorMap, sLightingEffectsMap}; return FindAttributeDependence(name, map) || SVGFELightingElementBase::IsAttributeMapped(name); } void SVGFELightingElement::GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) { - aSources.AppendElement(nsSVGStringInfo(&mStringAttributes[IN1], this)); + nsTArray<SVGStringInfo>& aSources) { + aSources.AppendElement(SVGStringInfo(&mStringAttributes[IN1], this)); } LightType SVGFELightingElement::ComputeLightAttributes( nsSVGFilterInstance* aInstance, nsTArray<float>& aFloatAttributes) { // find specified light for (nsCOMPtr<nsIContent> child = nsINode::GetFirstChild(); child; child = child->GetNextSibling()) { if (child->IsAnyOfSVGElements(nsGkAtoms::feDistantLight,
rename from dom/svg/nsSVGFilters.h rename to dom/svg/SVGFilters.h --- a/dom/svg/nsSVGFilters.h +++ b/dom/svg/SVGFilters.h @@ -14,28 +14,27 @@ #include "SVGElement.h" #include "nsSVGNumber2.h" #include "nsSVGNumberPair.h" #include "FilterSupport.h" class nsSVGFilterInstance; class nsSVGNumberPair; -struct nsSVGStringInfo { - nsSVGStringInfo(const nsSVGString* aString, - mozilla::dom::SVGElement* aElement) +namespace mozilla { +namespace dom { + +struct SVGStringInfo { + SVGStringInfo(const nsSVGString* aString, SVGElement* aElement) : mString(aString), mElement(aElement) {} const nsSVGString* mString; - mozilla::dom::SVGElement* mElement; + SVGElement* mElement; }; -namespace mozilla { -namespace dom { - typedef SVGElement SVGFEBase; #define NS_SVG_FE_CID \ { \ 0x60483958, 0xd229, 0x4a77, { \ 0x96, 0xb2, 0x62, 0x3e, 0x69, 0x95, 0x1e, 0x0e \ } \ } @@ -95,17 +94,17 @@ class SVGFE : public SVGFEBase { bool IsNodeOfType(uint32_t aFlags) const override { return !(aFlags & ~eFILTER); } virtual nsSVGString& GetResultImageName() = 0; // Return a list of all image names used as sources. Default is to // return no sources. - virtual void GetSourceImageNames(nsTArray<nsSVGStringInfo>& aSources); + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources); virtual FilterPrimitiveDescription GetPrimitiveDescription( nsSVGFilterInstance* aInstance, const IntRect& aFilterSubregion, const nsTArray<bool>& aInputsAreTainted, nsTArray<RefPtr<SourceSurface>>& aInputImages) = 0; // returns true if changes to the attribute should cause us to // repaint the filter @@ -192,18 +191,17 @@ class SVGFELightingElement : public SVGF NS_INLINE_DECL_REFCOUNTING_INHERITED(SVGFELightingElement, SVGFELightingElementBase) virtual bool AttributeAffectsRendering(int32_t aNameSpaceID, nsAtom* aAttribute) const override; virtual nsSVGString& GetResultImageName() override { return mStringAttributes[RESULT]; } - virtual void GetSourceImageNames( - nsTArray<nsSVGStringInfo>& aSources) override; + virtual void GetSourceImageNames(nsTArray<SVGStringInfo>& aSources) override; NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override; protected: virtual bool OperatesOnSRGB(int32_t aInputIndex, bool aInputIsAlreadySRGB) override { return true; }
--- a/dom/svg/moz.build +++ b/dom/svg/moz.build @@ -125,17 +125,16 @@ UNIFIED_SOURCES += [ 'nsISVGPoint.cpp', 'nsSVGAngle.cpp', 'nsSVGAnimatedTransformList.cpp', 'nsSVGBoolean.cpp', 'nsSVGClass.cpp', 'nsSVGDataParser.cpp', 'nsSVGEnum.cpp', 'nsSVGFeatures.cpp', - 'nsSVGFilters.cpp', 'nsSVGInteger.cpp', 'nsSVGIntegerPair.cpp', 'nsSVGLength2.cpp', 'nsSVGNumber2.cpp', 'nsSVGNumberPair.cpp', 'nsSVGPathDataParser.cpp', 'nsSVGString.cpp', 'nsSVGTransform.cpp', @@ -187,16 +186,17 @@ UNIFIED_SOURCES += [ 'SVGFEMorphologyElement.cpp', 'SVGFEOffsetElement.cpp', 'SVGFEPointLightElement.cpp', 'SVGFESpecularLightingElement.cpp', 'SVGFESpotLightElement.cpp', 'SVGFETileElement.cpp', 'SVGFETurbulenceElement.cpp', 'SVGFilterElement.cpp', + 'SVGFilters.cpp', 'SVGForeignObjectElement.cpp', 'SVGFragmentIdentifier.cpp', 'SVGGElement.cpp', 'SVGGeometryElement.cpp', 'SVGGradientElement.cpp', 'SVGGraphicsElement.cpp', 'SVGImageElement.cpp', 'SVGIntegerPairSMILType.cpp',
--- a/layout/svg/SVGFEContainerFrame.cpp +++ b/layout/svg/SVGFEContainerFrame.cpp @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // Keep in (case-insensitive) order: #include "nsContainerFrame.h" #include "nsGkAtoms.h" #include "nsIFrame.h" #include "nsLiteralString.h" #include "SVGObserverUtils.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" using namespace mozilla; /* * This frame is used by filter primitive elements that * have special child elements that provide parameters. */ class SVGFEContainerFrame final : public nsContainerFrame {
--- a/layout/svg/SVGFEImageFrame.cpp +++ b/layout/svg/SVGFEImageFrame.cpp @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // Keep in (case-insensitive) order: #include "nsContainerFrame.h" #include "nsFrame.h" #include "nsGkAtoms.h" #include "nsLiteralString.h" #include "SVGObserverUtils.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "mozilla/dom/SVGFEImageElement.h" #include "mozilla/dom/MutationEventBinding.h" using namespace mozilla; using namespace mozilla::dom; class SVGFEImageFrame final : public nsFrame { friend nsIFrame* NS_NewSVGFEImageFrame(nsIPresShell* aPresShell,
--- a/layout/svg/SVGFELeafFrame.cpp +++ b/layout/svg/SVGFELeafFrame.cpp @@ -5,17 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // Keep in (case-insensitive) order: #include "ComputedStyle.h" #include "nsContainerFrame.h" #include "nsFrame.h" #include "nsGkAtoms.h" #include "SVGObserverUtils.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" using namespace mozilla; /* * This frame is used by filter primitive elements that don't * have special child elements that provide parameters. */ class SVGFELeafFrame final : public nsFrame {
--- a/layout/svg/SVGFEUnstyledLeafFrame.cpp +++ b/layout/svg/SVGFEUnstyledLeafFrame.cpp @@ -4,17 +4,17 @@ * 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/. */ // Keep in (case-insensitive) order: #include "nsContainerFrame.h" #include "nsFrame.h" #include "nsGkAtoms.h" #include "SVGObserverUtils.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" using namespace mozilla; class SVGFEUnstyledLeafFrame final : public nsFrame { friend nsIFrame* NS_NewSVGFEUnstyledLeafFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle); protected:
--- a/layout/svg/nsFilterInstance.h +++ b/layout/svg/nsFilterInstance.h @@ -10,17 +10,17 @@ #include "gfxMatrix.h" #include "gfxPoint.h" #include "gfxRect.h" #include "nsCOMPtr.h" #include "nsHashKeys.h" #include "nsPoint.h" #include "nsRect.h" #include "nsSize.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" #include "nsSVGNumberPair.h" #include "nsTArray.h" #include "nsIFrame.h" #include "mozilla/gfx/2D.h" #include "mozilla/webrender/WebRenderTypes.h" class gfxContext;
--- a/layout/svg/nsSVGFilterInstance.cpp +++ b/layout/svg/nsSVGFilterInstance.cpp @@ -314,17 +314,17 @@ int32_t nsSVGFilterInstance::GetOrCreate return mSourceAlphaIndex; } nsresult nsSVGFilterInstance::GetSourceIndices( SVGFE* aPrimitiveElement, nsTArray<FilterPrimitiveDescription>& aPrimitiveDescrs, const nsDataHashtable<nsStringHashKey, int32_t>& aImageTable, nsTArray<int32_t>& aSourceIndices) { - AutoTArray<nsSVGStringInfo, 2> sources; + AutoTArray<SVGStringInfo, 2> sources; aPrimitiveElement->GetSourceImageNames(sources); for (uint32_t j = 0; j < sources.Length(); j++) { nsAutoString str; sources[j].mString->GetAnimValue(str, sources[j].mElement); int32_t sourceIndex = 0; if (str.EqualsLiteral("SourceGraphic")) {
--- a/layout/svg/nsSVGFilterInstance.h +++ b/layout/svg/nsSVGFilterInstance.h @@ -4,17 +4,17 @@ * 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/. */ #ifndef __NS_SVGFILTERINSTANCE_H__ #define __NS_SVGFILTERINSTANCE_H__ #include "gfxMatrix.h" #include "gfxRect.h" -#include "nsSVGFilters.h" +#include "SVGFilters.h" #include "nsSVGNumber2.h" #include "nsSVGNumberPair.h" #include "nsTArray.h" class nsSVGFilterFrame; struct nsStyleFilter; namespace mozilla {