Bug 1082477, part 1 - Convert Matrix4x4::TranslatePost/ScalePost callers to Matrix4x4::PostTranslate/PostScale. r=Bas

This commit is contained in:
Jonathan Watt 2014-10-16 10:51:12 +01:00
parent e98d3a9fb7
commit efe6e3ef6a
5 changed files with 6 additions and 6 deletions

View File

@ -467,7 +467,7 @@ LayerPropertiesBase::ComputeDifferences(Layer* aRoot, NotifySubDocInvalidationFu
void
LayerPropertiesBase::MoveBy(const nsIntPoint& aOffset)
{
mTransform.TranslatePost(aOffset.x, aOffset.y, 0);
mTransform.PostTranslate(aOffset.x, aOffset.y, 0);
}
} // namespace layers

View File

@ -918,7 +918,7 @@ AsyncCompositionManager::TransformScrollableLayer(Layer* aLayer)
1.0f/container->GetPreYScale(),
1);
}
computedTransform.ScalePost(1.0f/aLayer->GetPostXScale(),
computedTransform.PostScale(1.0f/aLayer->GetPostXScale(),
1.0f/aLayer->GetPostYScale(),
1);
layerComposite->SetShadowTransform(computedTransform);

View File

@ -855,7 +855,7 @@ LayerManagerComposite::ComputeRenderIntegrity()
Layer* rootScrollable = rootScrollableLayers[0];
const FrameMetrics& metrics = LayerMetricsWrapper::TopmostScrollableMetrics(rootScrollable);
Matrix4x4 transform = rootScrollable->GetEffectiveTransform();
transform.ScalePost(metrics.mResolution.scale, metrics.mResolution.scale, 1);
transform.PostScale(metrics.mResolution.scale, metrics.mResolution.scale, 1);
// Clip the screen rect to the document bounds
Rect documentBounds =

View File

@ -670,7 +670,7 @@ LayerTransactionParent::RecvGetAnimationTransform(PLayerParent* aParent,
Matrix4x4 transform = layer->AsLayerComposite()->GetShadowTransform();
if (ContainerLayer* c = layer->AsContainerLayer()) {
// Undo the scale transform applied by AsyncCompositionManager::SampleValue
transform.ScalePost(1.0f/c->GetInheritedXScale(),
transform.PostScale(1.0f/c->GetInheritedXScale(),
1.0f/c->GetInheritedYScale(),
1.0f);
}

View File

@ -698,8 +698,8 @@ TEST_F(APZCBasicTester, ComplexTransform) {
Matrix4x4(),
Matrix4x4(),
};
transforms[0].ScalePost(0.5f, 0.5f, 1.0f); // this results from the 2.0 resolution on the root layer
transforms[1].ScalePost(2.0f, 1.0f, 1.0f); // this is the 2.0 x-axis CSS transform on the child layer
transforms[0].PostScale(0.5f, 0.5f, 1.0f); // this results from the 2.0 resolution on the root layer
transforms[1].PostScale(2.0f, 1.0f, 1.0f); // this is the 2.0 x-axis CSS transform on the child layer
nsTArray<nsRefPtr<Layer> > layers;
nsRefPtr<LayerManager> lm;