Bug 1040906 - Replace the out-param on matrix conversion helpers with a return value. r=Bas

This commit is contained in:
Kartikaya Gupta
2014-07-22 09:12:14 -04:00
parent 2a7605a829
commit e480e44f68
17 changed files with 78 additions and 123 deletions

View File

@@ -1711,8 +1711,7 @@ static void
SetOuterVisibleRegion(Layer* aLayer, nsIntRegion* aOuterVisibleRegion,
const nsIntRect* aLayerContentsVisibleRect = nullptr)
{
gfx3DMatrix transform;
To3DMatrix(aLayer->GetTransform(), transform);
gfx3DMatrix transform = To3DMatrix(aLayer->GetTransform());
gfxMatrix transform2D;
if (transform.Is2D(&transform2D) && !transform2D.HasNonIntegerTranslation()) {
aOuterVisibleRegion->MoveBy(-int(transform2D._31), -int(transform2D._32));
@@ -3647,9 +3646,7 @@ ChooseScaleAndSetTransform(FrameLayerBuilder* aLayerBuilder,
}
// Store the inverse of our resolution-scale on the layer
Matrix4x4 baseTransform;
ToMatrix4x4(transform, baseTransform);
aLayer->SetBaseTransform(baseTransform);
aLayer->SetBaseTransform(ToMatrix4x4(transform));
aLayer->SetPreScale(1.0f/float(scale.width),
1.0f/float(scale.height));
aLayer->SetInheritedScale(aIncomingScale.mXScale,