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

Backed out changeset 1d056bb94292 (bug 779395) for reftest failures on Tegras

Browse Source
This commit is contained in:
Ed Morley 2013-05-21 14:03:43 +01:00
parent fb1bdaf8dd
commit fa097e6aaa
3 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gfx/layers/Layers.cpp
View File

@ -284,21 +284,14 @@ CreateCSSValueList(const InfallibleTArray<TransformFunction>& aFunctions)
{
float x = aFunctions[i].get_SkewX().x();
arr = nsStyleAnimation::AppendTransformFunction(eCSSKeyword_skewx, resultTail);
arr->Item(1).SetFloatValue(x, eCSSUnit_Radian);
arr->Item(1).SetFloatValue(x, eCSSUnit_Number);
break;
}
case TransformFunction::TSkewY:
{
float y = aFunctions[i].get_SkewY().y();
arr = nsStyleAnimation::AppendTransformFunction(eCSSKeyword_skewy, resultTail);
arr->Item(1).SetFloatValue(y, eCSSUnit_Radian);
break;
}
case TransformFunction::TSkew:
{
arr = nsStyleAnimation::AppendTransformFunction(eCSSKeyword_skew, resultTail);
arr->Item(1).SetFloatValue(aFunctions[i].get_Skew().x(), eCSSUnit_Radian);
arr->Item(2).SetFloatValue(aFunctions[i].get_Skew().y(), eCSSUnit_Radian);
arr->Item(1).SetFloatValue(y, eCSSUnit_Number);
break;
}
case TransformFunction::TTransformMatrix:

2
gfx/layers/ipc/LayerTransaction.ipdlh
View File

@ -100,7 +100,6 @@ struct Scale {
float y;
float z;
};
struct Skew { float x; float y; };
struct SkewX { float x; };
struct SkewY { float y; };
struct TransformMatrix { gfx3DMatrix value; };
@ -118,7 +117,6 @@ union TransformFunction {
Rotation;
Rotation3D;
Scale;
Skew;
SkewX;
SkewY;
Translation;

15
layout/base/nsDisplayList.cpp
View File

@ -201,27 +201,16 @@ static void AddTransformFunctions(nsCSSValueList* aList,
}
case eCSSKeyword_skewx:
{
double x = array->Item(1).GetAngleValueInRadians();
double x = array->Item(1).GetFloatValue();
aFunctions.AppendElement(SkewX(x));
break;
}
case eCSSKeyword_skewy:
{
double y = array->Item(1).GetAngleValueInRadians();
double y = array->Item(1).GetFloatValue();
aFunctions.AppendElement(SkewY(y));
break;
}
case eCSSKeyword_skew:
{
double x = array->Item(1).GetAngleValueInRadians();
// skew(x) is shorthand for skew(x, 0)
double y = 0;
if (array->Count() == 3) {
y = array->Item(2).GetAngleValueInRadians();
}
aFunctions.AppendElement(Skew(x, y));
break;
}
case eCSSKeyword_matrix:
{
gfx3DMatrix matrix;