Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 14:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 621984 - replace mozRequestAnimationFrame() with mozRequestAnimationFrame(callback) [r=vingtetun]

Browse Source
This commit is contained in:
Mark Finkle 2011-01-03 10:47:04 -05:00
parent b70ffdc5a8
commit 2259ebda8d
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mobile/chrome/content/input.js
View File

@ -121,10 +121,6 @@ function MouseModule() {
MouseModule.prototype = {
handleEvent: function handleEvent(aEvent) {
switch (aEvent.type) {
case "MozBeforePaint":
this._waitingForPaint = false;
removeEventListener("MozBeforePaint", this, false);
break;
case "contextmenu":
// bug 598965 - chrome UI should should stop to be pannable once the
// context menu has appeared
@ -162,6 +158,10 @@ MouseModule.prototype = {
}
},
onBeforePaint: function onBeforePaint(aTimeStamp) {
this._waitingForPaint = false;
},
/**
* This gets invoked by the input handler if another module grabs. We should
* reset our state or something here. This is probably doing the wrong thing
@ -388,8 +388,7 @@ MouseModule.prototype = {
let dragged = this._dragger.dragMove(dX, dY, this._targetScrollInterface);
if (dragged && !this._waitingForPaint) {
this._waitingForPaint = true;
mozRequestAnimationFrame();
addEventListener("MozBeforePaint", this, false);
mozRequestAnimationFrame(this);
}
return dragged;
},
@ -812,17 +811,13 @@ function KineticController(aPanBy, aEndCallback) {
KineticController.prototype = {
_reset: function _reset() {
if (this._callback) {
removeEventListener("MozBeforePaint", this._callback, false);
this._callback = null;
}
this._active = false;
this.momentumBuffer = [];
this._velocity.set(0, 0);
},
isActive: function isActive() {
return !!this._callback;
return this._active;
},
_startTimer: function _startTimer() {
@ -857,15 +852,14 @@ KineticController.prototype = {
let self = this;
let callback = {
handleEvent: function kineticHandleEvent(event) {
onBeforePaint: function kineticHandleEvent(timeStamp) {
if (!self.isActive()) // someone called end() on us between timer intervals
return;
// To make animation end fast enough but to keep smoothness, average the ideal
// time frame (smooth animation) with the actual time lapse (end fast enough).
// Animation will never take longer than 2 times the ideal length of time.
let realt = event.timeStamp - self._initialTime;
let realt = timeStamp - self._initialTime;
self._time += self._updateInterval;
let t = (self._time + realt) / 2;
@ -898,13 +892,12 @@ KineticController.prototype = {
if (!panned)
self.end();
else
mozRequestAnimationFrame();
mozRequestAnimationFrame(this);
}
};
this._callback = callback;
addEventListener("MozBeforePaint", callback, false);
mozRequestAnimationFrame();
this._active = true;
mozRequestAnimationFrame(callback);
},
start: function start() {