Don't have a default repaint interval of "never" for APZ animations. (bug 1152138, r=botond)

This commit is contained in:
David Anderson 2015-04-07 21:32:42 -07:00
parent 42f1c74f32
commit bf68b2d55b
2 changed files with 5 additions and 4 deletions

View File

@ -22,8 +22,7 @@ class AsyncPanZoomAnimation {
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AsyncPanZoomAnimation) NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AsyncPanZoomAnimation)
public: public:
explicit AsyncPanZoomAnimation(const TimeDuration& aRepaintInterval = explicit AsyncPanZoomAnimation(const TimeDuration& aRepaintInterval)
TimeDuration::Forever())
: mRepaintInterval(aRepaintInterval) : mRepaintInterval(aRepaintInterval)
{ } { }

View File

@ -592,7 +592,8 @@ class ZoomAnimation: public AsyncPanZoomAnimation {
public: public:
ZoomAnimation(CSSPoint aStartOffset, CSSToParentLayerScale2D aStartZoom, ZoomAnimation(CSSPoint aStartOffset, CSSToParentLayerScale2D aStartZoom,
CSSPoint aEndOffset, CSSToParentLayerScale2D aEndZoom) CSSPoint aEndOffset, CSSToParentLayerScale2D aEndZoom)
: mTotalDuration(TimeDuration::FromMilliseconds(gfxPrefs::APZZoomAnimationDuration())) : AsyncPanZoomAnimation(TimeDuration::Forever())
, mTotalDuration(TimeDuration::FromMilliseconds(gfxPrefs::APZZoomAnimationDuration()))
, mStartOffset(aStartOffset) , mStartOffset(aStartOffset)
, mStartZoom(aStartZoom) , mStartZoom(aStartZoom)
, mEndOffset(aEndOffset) , mEndOffset(aEndOffset)
@ -650,7 +651,8 @@ private:
class OverscrollAnimation: public AsyncPanZoomAnimation { class OverscrollAnimation: public AsyncPanZoomAnimation {
public: public:
explicit OverscrollAnimation(AsyncPanZoomController& aApzc, const ParentLayerPoint& aVelocity) explicit OverscrollAnimation(AsyncPanZoomController& aApzc, const ParentLayerPoint& aVelocity)
: mApzc(aApzc) : AsyncPanZoomAnimation(TimeDuration::Forever())
, mApzc(aApzc)
{ {
mApzc.mX.SetVelocity(aVelocity.x); mApzc.mX.SetVelocity(aVelocity.x);
mApzc.mY.SetVelocity(aVelocity.y); mApzc.mY.SetVelocity(aVelocity.y);