Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1259529 - Ensure that the APZ minimap for subframes remains scaled to the visible portion of the composition bounds. r=BenWa

Browse Source 
MozReview-Commit-ID: Faxtlk6cIHx
This commit is contained in:
Kartikaya Gupta 2016-03-24 16:06:45 -04:00
parent 8314c3f23b
commit 0c92703124
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/layers/composite/ContainerLayerComposite.cpp
View File

@ -520,12 +520,22 @@ RenderMinimap(ContainerT* aContainer, LayerManagerComposite* aManager,
float scaleFactor;
float scaleFactorX;
float scaleFactorY;
scaleFactorX = 100.f / scrollRect.width;
scaleFactorY = ((viewRect.height) - 2 * verticalPadding) / scrollRect.height;
Rect dest = Rect(aClipRect.ToUnknownRect());
if (aLayer->GetEffectiveClipRect()) {
dest = Rect(aLayer->GetEffectiveClipRect().value().ToUnknownRect());
} else {
dest = aContainer->GetEffectiveTransform().Inverse().TransformBounds(dest);
}
dest = dest.Intersect(compositionBounds.ToUnknownRect());
scaleFactorX = std::min(100.f, dest.width - (2 * horizontalPadding)) / scrollRect.width;
scaleFactorY = (dest.height - (2 * verticalPadding)) / scrollRect.height;
scaleFactor = std::min(scaleFactorX, scaleFactorY);
if (scaleFactor <= 0) {
return;
}
Matrix4x4 transform = Matrix4x4::Scaling(scaleFactor, scaleFactor, 1);
transform.PostTranslate(horizontalPadding + compositionBounds.x, verticalPadding + compositionBounds.y, 0);
transform.PostTranslate(horizontalPadding + dest.x, verticalPadding + dest.y, 0);
Rect transformedScrollRect = transform.TransformBounds(scrollRect.ToUnknownRect());