wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 941327 - Match scale to scroll offset during zoom animation [r=botond]

Browse Source
This commit is contained in:
Matt Brubeck 2013-11-21 14:12:28 -08:00
parent 0b097c42d2
commit 574c2b7015
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/layers/ipc/AsyncPanZoomController.cpp
View File

@ -1199,9 +1199,11 @@ bool AsyncPanZoomController::SampleContentTransformForFrame(const TimeStamp& aSa
// will affect the final computed resolution.
double sampledPosition = gComputedTimingFunction->GetValue(animPosition);
mFrameMetrics.mZoom = CSSToScreenScale(
mEndZoomToMetrics.mZoom.scale * sampledPosition +
mStartZoomToMetrics.mZoom.scale * (1 - sampledPosition));
// We scale the scrollOffset linearly with sampledPosition, so the zoom
// needs to scale inversely to match.
mFrameMetrics.mZoom = CSSToScreenScale(1 /
(sampledPosition / mEndZoomToMetrics.mZoom.scale +
(1 - sampledPosition) / mStartZoomToMetrics.mZoom.scale));
mFrameMetrics.mScrollOffset = CSSPoint::FromUnknownPoint(gfx::Point(
mEndZoomToMetrics.mScrollOffset.x * sampledPosition +