[tor-commits] [tor-browser/esr24] Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it. r=mattwoodrow, a=1.2.x+

[mikeperry at torproject.org]

commit 91ef4ab9fd3794de7e18c9c9470511a26776da3b
Author: Benoit Jacob <bjacob at mozilla.com>
Date:   Thu Feb 20 11:41:39 2014 -0500

    Bug 963974 - Null mCurrentCompositeTask after calling Cancel() on it. r=mattwoodrow, a=1.2.x+
---
 gfx/layers/ipc/CompositorParent.cpp |    1 +
 1 file changed, 1 insertion(+)

diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp
index be6dbf7..4b61ec4 100644
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -256,6 +256,7 @@ CompositorParent::RecvFlushRendering()
   // and do it immediately instead.
   if (mCurrentCompositeTask) {
     mCurrentCompositeTask->Cancel();
+    mCurrentCompositeTask = nullptr;
     ComposeToTarget(nullptr);
   }
   return true;