Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 41ecbb9a5fac (bug 1092634) for reftest bustage

Browse Source
This commit is contained in:
Wes Kocher 2014-11-18 17:21:08 -08:00
parent 46ab4e3fb0
commit 92049c1863
7 changed files with 1 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/2d/FilterNodeSoftware.cpp
View File

@ -1460,9 +1460,6 @@ FilterNodeColorMatrixSoftware::RequestFromInputsForRect(const IntRect &aRect)
IntRect
FilterNodeColorMatrixSoftware::GetOutputRectInRect(const IntRect& aRect)
{
if (mMatrix._54 > 0.0f) {
return aRect;
}
return GetInputRectInRect(IN_COLOR_MATRIX_IN, aRect);
}
@ -1811,10 +1808,7 @@ FilterNodeComponentTransferSoftware::RequestFromInputsForRect(const IntRect &aRe
IntRect
FilterNodeComponentTransferSoftware::GetOutputRectInRect(const IntRect& aRect)
{
if (mDisableA) {
return GetInputRectInRect(IN_TRANSFER_IN, aRect);
}
return aRect;
return GetInputRectInRect(IN_TRANSFER_IN, aRect);
}
int32_t

57
gfx/src/FilterSupport.cpp
View File

@ -1389,42 +1389,6 @@ FilterSupport::ComputeResultChangeRegion(const FilterDescription& aFilter,
return resultChangeRegions[resultChangeRegions.Length() - 1];
}
static float
ResultOfZeroUnderTransferFunction(const AttributeMap& aFunctionAttributes)
{
switch (aFunctionAttributes.GetUint(eComponentTransferFunctionType)) {
case SVG_FECOMPONENTTRANSFER_TYPE_TABLE:
{
const nsTArray<float>& tableValues =
aFunctionAttributes.GetFloats(eComponentTransferFunctionTableValues);
if (tableValues.Length() < 2) {
return 0.0f;
}
return tableValues[0];
}
case SVG_FECOMPONENTTRANSFER_TYPE_DISCRETE:
{
const nsTArray<float>& tableValues =
aFunctionAttributes.GetFloats(eComponentTransferFunctionTableValues);
if (tableValues.Length() < 1) {
return 0.0f;
}
return tableValues[0];
}
case SVG_FECOMPONENTTRANSFER_TYPE_LINEAR:
return aFunctionAttributes.GetFloat(eComponentTransferFunctionIntercept);
case SVG_FECOMPONENTTRANSFER_TYPE_GAMMA:
return aFunctionAttributes.GetFloat(eComponentTransferFunctionOffset);
case SVG_FECOMPONENTTRANSFER_TYPE_IDENTITY:
default:
return 0.0f;
}
}
nsIntRegion
FilterSupport::PostFilterExtentsForPrimitive(const FilterPrimitiveDescription& aDescription,
const nsTArray<nsIntRegion>& aInputExtents)
@ -1475,27 +1439,6 @@ FilterSupport::PostFilterExtentsForPrimitive(const FilterPrimitiveDescription& a
return ThebesIntRect(aDescription.PrimitiveSubregion());
}
case PrimitiveType::ColorMatrix:
{
if (atts.GetUint(eColorMatrixType) == (uint32_t)SVG_FECOLORMATRIX_TYPE_MATRIX) {
const nsTArray<float>& values = atts.GetFloats(eColorMatrixValues);
if (values[19] > 0.0f) {
return ThebesIntRect(aDescription.PrimitiveSubregion());
}
}
return aInputExtents[0];
}
case PrimitiveType::ComponentTransfer:
{
AttributeMap functionAttributes =
atts.GetAttributeMap(eComponentTransferFunctionA);
if (ResultOfZeroUnderTransferFunction(functionAttributes) > 0.0f) {
return ThebesIntRect(aDescription.PrimitiveSubregion());
}
return aInputExtents[0];
}
case PrimitiveType::Turbulence:
case PrimitiveType::Image:
{

10
layout/reftests/svg/filters/outside-sourcegraphic-1.svg
View File

@ -1,10 +0,0 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<svg xmlns="http://www.w3.org/2000/svg">
<filter id="f" filterUnits="userSpaceOnUse" x="0" y="0" width="200" height="200">
<feFlood flood-color="lime"/>
</filter>
<rect width="100" height="100" filter="url(#f)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 348 B

13
layout/reftests/svg/filters/outside-sourcegraphic-2.svg
View File

@ -1,13 +0,0 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<svg xmlns="http://www.w3.org/2000/svg">
<filter id="f" filterUnits="userSpaceOnUse" x="0" y="0" width="200" height="200">
<feColorMatrix type="matrix" values="0 0 0 0 0
0 0 0 0 1
0 0 0 0 0
0 0 0 0 1"/>
</filter>
<rect width="100" height="100" filter="url(#f)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 525 B

15
layout/reftests/svg/filters/outside-sourcegraphic-3.svg
View File

@ -1,15 +0,0 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<svg xmlns="http://www.w3.org/2000/svg">
<filter id="f" filterUnits="userSpaceOnUse" x="0" y="0" width="200" height="200">
<feComponentTransfer>
<feFuncR type="table" tableValues="0 0" />
<feFuncG type="table" tableValues="1 1" />
<feFuncB type="table" tableValues="0 0" />
<feFuncA type="table" tableValues="1 1" />
</feComponentTransfer>
</filter>
<rect width="100" height="100" filter="url(#f)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 563 B

7
layout/reftests/svg/filters/outside-sourcegraphic-ref.svg
View File

@ -1,7 +0,0 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<svg xmlns="http://www.w3.org/2000/svg">
<rect width="200" height="200" fill="lime"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 213 B

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

@ -116,7 +116,3 @@ fuzzy(2,2659) skip-if(d2d) == feSpecularLighting-1.svg feSpecularLighting-1-ref.
== fePointLight-zoomed-page.svg fePointLight-zoomed-page-ref.svg
== feTurbulence-offset.svg feTurbulence-offset-ref.svg
== outside-sourcegraphic-1.svg outside-sourcegraphic-ref.svg
== outside-sourcegraphic-2.svg outside-sourcegraphic-ref.svg
== outside-sourcegraphic-3.svg outside-sourcegraphic-ref.svg