author | Jan Henning <jh+bugzilla@buttercookie.de> |
Sat, 24 Mar 2018 21:27:06 +0100 | |
changeset 411515 | a2e0f2e299bcc1cad4ea74e55d4d7b9c0f6c1a49 |
parent 411514 | edbbd00906426ed221f277f44bd7b8fac70e450d |
child 411516 | 5506727613da421f524877e817c1fd1529160ab8 |
push id | 101686 |
push user | aciure@mozilla.com |
push date | Tue, 03 Apr 2018 21:59:31 +0000 |
treeherder | mozilla-inbound@8d846598d35d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | botond |
bugs | 1281907 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -3186,28 +3186,25 @@ APZCTreeManager::ComputeTransformForScro // and then unapplying it after unapplying the async transform. if (aScrollbarIsDescendant) { AsyncTransformComponentMatrix overscroll = aApzc->GetOverscrollTransform(AsyncPanZoomController::eForCompositing); Matrix4x4 asyncUntransform = (asyncTransform * overscroll).Inverse().ToUnknownMatrix(); const Matrix4x4& contentTransform = aScrollableContentTransform; Matrix4x4 contentUntransform = contentTransform.Inverse(); - AsyncTransformComponentMatrix asyncCompensation = - ViewAs<AsyncTransformComponentMatrix>( - contentTransform - * asyncUntransform - * contentUntransform); - - compensation = compensation * asyncCompensation; - - // Pass the async compensation out to the caller so that it can use it + compensation *= ViewAs<AsyncTransformComponentMatrix>( + contentTransform + * asyncUntransform + * contentUntransform); + + // Pass the total compensation out to the caller so that it can use it // to transform clip transforms as needed. if (aOutClipTransform) { - *aOutClipTransform = asyncCompensation; + *aOutClipTransform = compensation; } } transform = transform * compensation; return transform; } APZSampler*