Bug 1018255 - Fix a short-circuit evaluation bug in OverscrollSnapBackAnimation::Sample. r=kats

--HG--
extra : source : c01a9ce7adb6693dbf5819fe853d4c7076bbd75a
This commit is contained in:
Botond Ballo 2014-06-03 17:31:25 -04:00
parent df415c9a1c
commit d08dc47ea7

View File

@ -488,8 +488,10 @@ public:
virtual bool Sample(FrameMetrics& aFrameMetrics,
const TimeDuration& aDelta) MOZ_OVERRIDE
{
return mApzc.mX.SampleSnapBack(aDelta)
|| mApzc.mY.SampleSnapBack(aDelta);
// Can't inline these variables due to short-circuit evaluation.
bool continueX = mApzc.mX.SampleSnapBack(aDelta);
bool continueY = mApzc.mY.SampleSnapBack(aDelta);
return continueX || continueY;
}
private: