corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1201076 - Don't clobber the page rect update if one comes in while in the middle of a bounce animation. r=snorp

Browse Source
This commit is contained in:
Kartikaya Gupta
2015-09-28 11:06:37 -04:00
parent 5bd11039aa
commit f9d9f2ce77
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/base/gfx/JavaPanZoomController.java
View File

@@ -950,14 +950,14 @@ class JavaPanZoomController
synchronized (mTarget.getLock()) {
float t = easeOut((float)mBounceDuration / BOUNCE_ANIMATION_DURATION);
ImmutableViewportMetrics newMetrics = mBounceStartMetrics.interpolate(mBounceEndMetrics, t);
mTarget.setViewportMetrics(newMetrics);
mTarget.setViewportMetrics(newMetrics.setPageRectFrom(getMetrics()));
}
}
/* Concludes a bounce animation and snaps the viewport into place. */
private void finishBounce() {
synchronized (mTarget.getLock()) {
mTarget.setViewportMetrics(mBounceEndMetrics);
mTarget.setViewportMetrics(mBounceEndMetrics.setPageRectFrom(getMetrics()));
}
}
}