Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it - r=mattwoodrow
authorBenoit Jacob <bjacob@mozilla.com>
Thu, 20 Feb 2014 11:41:39 -0500
changeset 170063 0d41267969e125873702e078a63e7adf8aff6328
parent 170062 e43eaa875fa020fc521bba802e01fd849e5cddda
child 170064 7dc90f3c1a213ba65292985de8c3d7c002bc8512
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersmattwoodrow
bugs963974
milestone30.0a1
Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it - r=mattwoodrow
gfx/layers/ipc/CompositorParent.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -325,16 +325,17 @@ CompositorParent::RecvMakeSnapshot(const
 
 bool
 CompositorParent::RecvFlushRendering()
 {
   // If we're waiting to do a composite, then cancel it
   // and do it immediately instead.
   if (mCurrentCompositeTask) {
     mCurrentCompositeTask->Cancel();
+    mCurrentCompositeTask = nullptr;
     ForceComposeToTarget(nullptr);
   }
   return true;
 }
 
 bool
 CompositorParent::RecvForceComposite()
 {