Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 708173. Use cancelRequestAnimationCallback instead of tracking booleans in scrollbox code. r=dao

Browse Source
This commit is contained in:
Boris Zbarsky 2011-12-08 01:32:04 -05:00
parent 0dd5df7749
commit ce77544e56
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
toolkit/content/widgets/scrollbox.xml
View File

@ -272,26 +272,21 @@
<field name="_scrollAnim"><![CDATA[({
scrollbox: this,
started: false,
requestHandle: 0, /* 0 indicates there is no pending request */
start: function scrollAnim_start(distance) {
this.distance = distance;
this.startPos = this.scrollbox.scrollPosition;
this.duration = Math.min(1000, Math.round(50 * Math.sqrt(Math.abs(distance))));
this.startTime = window.mozAnimationStartTime;
if (!this.started) {
this.started = true;
window.mozRequestAnimationFrame(this);
}
if (!this.requestHandle)
this.requestHandle = window.mozRequestAnimationFrame(this);
},
stop: function scrollAnim_stop() {
this.started = false;
window.mozCancelRequestAnimationFrame(this.requestHandle);
this.requestHandle = 0;
},
sample: function scrollAnim_handleEvent(timeStamp) {
if (!this.started) {
// We've been stopped
return;
}
const timePassed = timeStamp - this.startTime;
const pos = timePassed >= this.duration ? 1 :
1 - Math.pow(1 - timePassed / this.duration, 4);
@ -646,22 +641,17 @@
<field name="_arrowScrollAnim"><![CDATA[({
scrollbox: this,
started: false,
requestHandle: 0, /* 0 indicates there is no pending request */
start: function arrowSmoothScroll_start() {
this.lastFrameTime = window.mozAnimationStartTime;
if (!this.started) {
this.started = true;
window.mozRequestAnimationFrame(this);
}
if (!this.requestHandle)
this.requestHandle = window.mozRequestAnimationFrame(this);
},
stop: function arrowSmoothScroll_stop() {
this.started = false;
window.mozCancelRequestAnimationFrame(this.requestHandle);
this.requestHandle = 0;
},
sample: function arrowSmoothScroll_handleEvent(timeStamp) {
if (!this.started) {
// We've been stopped
return;
}
const scrollIndex = this.scrollbox._scrollIndex;
const timePassed = timeStamp - this.lastFrameTime;
this.lastFrameTime = timeStamp;