Bug 952116 - Add mutex around APZC::CancelAnimation; r=kats a=lsblakk
authorAnthony Jones <ajones@mozilla.com>
Fri, 20 Dec 2013 09:58:24 +1300
changeset 175460 39533c25c43cae0e7af1afa9868fb16730e16ad5
parent 175459 6c6fd43f57a44b9ace0dfe5d062755f180dee660
child 175461 dbde477a0625cfc164a60787387b19179bfc7b05
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats, lsblakk
bugs952116
milestone28.0a2
Bug 952116 - Add mutex around APZC::CancelAnimation; r=kats a=lsblakk
gfx/layers/ipc/AsyncPanZoomController.cpp
--- a/gfx/layers/ipc/AsyncPanZoomController.cpp
+++ b/gfx/layers/ipc/AsyncPanZoomController.cpp
@@ -1092,16 +1092,17 @@ void AsyncPanZoomController::StartAnimat
 {
   ReentrantMonitorAutoEnter lock(mMonitor);
   mAnimation = aAnimation;
   mLastSampleTime = GetFrameTime();
   ScheduleComposite();
 }
 
 void AsyncPanZoomController::CancelAnimation() {
+  ReentrantMonitorAutoEnter lock(mMonitor);
   SetState(NOTHING);
   mAnimation = nullptr;
 }
 
 void AsyncPanZoomController::SetCompositorParent(CompositorParent* aCompositorParent) {
   mCompositorParent = aCompositorParent;
 }