corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 952977: Convert GetLocalTransform to gfx::Matrix4x4 r=nical

Browse Source
This commit is contained in:
David Zbarsky
2014-01-27 10:28:18 -05:00
parent b8816e2953
commit df33ba2acb
9 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/layers/basic/BasicContainerLayer.cpp
View File

@@ -40,28 +40,24 @@ BasicContainerLayer::ComputeEffectiveTransforms(const Matrix4x4& aTransformToSur
// are aligned in device space, so it doesn't really matter how we snap
// containers.
Matrix residual;
gfx3DMatrix idealTransform;
To3DMatrix(aTransformToSurface, idealTransform);
idealTransform = GetLocalTransform() * idealTransform;
Matrix4x4 idealTransform = GetLocalTransform() * aTransformToSurface;
idealTransform.ProjectTo2D();
if (!idealTransform.CanDraw2D()) {
ToMatrix4x4(idealTransform, mEffectiveTransform);
mEffectiveTransform = idealTransform;
ComputeEffectiveTransformsForChildren(Matrix4x4());
ComputeEffectiveTransformForMaskLayer(Matrix4x4());
mUseIntermediateSurface = true;
return;
}
Matrix4x4 ideal;
ToMatrix4x4(idealTransform, ideal);
mEffectiveTransform = SnapTransformTranslation(ideal, &residual);
mEffectiveTransform = SnapTransformTranslation(idealTransform, &residual);
// We always pass the ideal matrix down to our children, so there is no
// need to apply any compensation using the residual from SnapTransformTranslation.
ComputeEffectiveTransformsForChildren(ideal);
ComputeEffectiveTransformsForChildren(idealTransform);
ComputeEffectiveTransformForMaskLayer(aTransformToSurface);
Layer* child = GetFirstChild();
bool hasSingleBlendingChild = false;
if (!HasMultipleChildren() && child) {