author | Randall Barker <rbarker@mozilla.com> |
Thu, 16 Jun 2016 16:40:28 +0100 | |
changeset 302011 | f97c058ecdeb29f13c3e1e01794cbfebd24ca815 |
parent 302010 | feb0e93ac30db4ea9533a247f38d2505d45bef32 |
child 302012 | a95a934791f7a2657896db7b626ac1bf95e2bc5b |
push id | 30348 |
push user | cbook@mozilla.com |
push date | Sat, 18 Jun 2016 03:35:24 +0000 |
treeherder | mozilla-central@3ce53bd1e25b [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | kats |
bugs | 1280580 |
milestone | 50.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/AndroidAPZ.cpp +++ b/gfx/layers/apz/src/AndroidAPZ.cpp @@ -132,17 +132,17 @@ AndroidFlingAnimation::DoSample(FrameMet ParentLayerPoint velocity = mPreviousVelocity; // Sometimes the OverScroller fails to update the offset for a frame. // If the frame can still scroll we just use the velocity from the previous // frame. However, if the frame can no longer scroll in the direction // of the fling, then end the animation. if (offset != mPreviousOffset) { if (aDelta.ToMilliseconds() > 0) { - velocity = (mPreviousOffset - offset) / (float)aDelta.ToMilliseconds(); + velocity = (offset - mPreviousOffset) / (float)aDelta.ToMilliseconds(); mPreviousVelocity = velocity; } } else if (hitBoundX || hitBoundY) { // We have reached the end of the scroll in one of the directions being scrolled and the offset has not // changed so end animation. shouldContinueFling = false; }