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

Merge backout.

Browse Source
This commit is contained in:
Robert Sayre 2010-08-14 21:27:54 -04:00
commit f5027815c6
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1068,7 +1068,7 @@ public:
virtual nsXPCClassInfo* GetClassInfo();
protected:
virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; }
virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; }
virtual EnumAttributesInfo GetEnumInfo();
virtual StringAttributesInfo GetStringInfo();
@ -1695,7 +1695,7 @@ public:
virtual nsXPCClassInfo* GetClassInfo();
protected:
virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_FALSE; }
virtual PRBool OperatesOnPremultipledAlpha() { return PR_FALSE; }
virtual StringAttributesInfo GetStringInfo();
@ -2715,7 +2715,7 @@ public:
virtual nsXPCClassInfo* GetClassInfo();
protected:
virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*,
PRInt32, Image*) { return PR_TRUE; }
PRUint32, Image*) { return PR_TRUE; }
virtual StringAttributesInfo GetStringInfo();
@ -3898,7 +3898,7 @@ public:
virtual nsXPCClassInfo* GetClassInfo();
protected:
virtual PRBool OperatesOnPremultipledAlpha(PRInt32) {
virtual PRBool OperatesOnPremultipledAlpha() {
return !mBooleanAttributes[PRESERVEALPHA].GetAnimValue();
}
@ -5354,7 +5354,7 @@ private:
protected:
virtual PRBool OperatesOnSRGB(nsSVGFilterInstance*,
PRInt32, Image*) { return PR_TRUE; }
PRUint32, Image*) { return PR_TRUE; }
virtual nsSVGPreserveAspectRatio *GetPreserveAspectRatio();
virtual StringAttributesInfo GetStringInfo();
@ -5689,16 +5689,13 @@ public:
virtual nsXPCClassInfo* GetClassInfo();
protected:
virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance,
PRInt32 aInput, Image* aImage) {
if (aInput == 0)
PRUint32 aInput, Image* aImage) {
if (aInput == 0 && aImage)
return aImage->mColorModel.mColorSpace == ColorModel::SRGB;
return nsSVGFEDisplacementMapElementBase::OperatesOnSRGB(aInstance,
aInput, aImage);
}
virtual PRBool OperatesOnPremultipledAlpha(PRInt32 aInput) {
return !(aInput == 1);
}
virtual NumberAttributesInfo GetNumberInfo();
virtual EnumAttributesInfo GetEnumInfo();

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

@ -119,21 +119,21 @@ protected:
public:
ColorModel
GetInputColorModel(nsSVGFilterInstance* aInstance, PRInt32 aInputIndex,
GetInputColorModel(nsSVGFilterInstance* aInstance, PRUint32 aInputIndex,
Image* aImage) {
return ColorModel(
(OperatesOnSRGB(aInstance, aInputIndex, aImage) ?
ColorModel::SRGB : ColorModel::LINEAR_RGB),
(OperatesOnPremultipledAlpha(aInputIndex) ?
(OperatesOnPremultipledAlpha() ?
ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED));
}
ColorModel
GetOutputColorModel(nsSVGFilterInstance* aInstance) {
return ColorModel(
(OperatesOnSRGB(aInstance, -1, nsnull) ?
(OperatesOnSRGB(aInstance, 0, nsnull) ?
ColorModel::SRGB : ColorModel::LINEAR_RGB),
(OperatesOnPremultipledAlpha(-1) ?
(OperatesOnPremultipledAlpha() ?
ColorModel::PREMULTIPLIED : ColorModel::UNPREMULTIPLIED));
}
@ -199,13 +199,13 @@ public:
operator nsISupports*() { return static_cast<nsIContent*>(this); }
protected:
virtual PRBool OperatesOnPremultipledAlpha(PRInt32) { return PR_TRUE; }
virtual PRBool OperatesOnPremultipledAlpha() { return PR_TRUE; }
// Called either with aInputIndex >=0 in which case this is
// Called either with aImage non-null, in which case this is
// testing whether the input 'aInputIndex' should be SRGB, or
// if aInputIndex is -1 returns true if the output will be SRGB
// if aImage is null returns true if the output will be SRGB
virtual PRBool OperatesOnSRGB(nsSVGFilterInstance* aInstance,
PRInt32 aInputIndex, Image* aImage) {
PRUint32 aInputIndex, Image* aImage) {
nsIFrame* frame = GetPrimaryFrame();
if (!frame) return PR_FALSE;

2
layout/reftests/svg/filters/reftest.list
View File

@ -72,8 +72,6 @@ fails == filter-marked-line-01.svg pass.svg # bug 477704
== feConvolveMatrix-bias-01.svg feConvolveMatrix-bias-01-ref.svg
== feConvolveMatrix-order-01.svg feConvolveMatrix-order-01-ref.svg
== feDisplacementMap-alpha-01.svg pass.svg
== feMorphology-radius-negative-01.svg pass.svg
== feMorphology-radius-negative-02.svg pass.svg
== feMorphology-radius-zero-01.svg pass.svg