From 6cad61179f5bdc8b3197a1c5095d81a95ac6c9e9 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Mon, 21 Jul 2014 15:42:58 -0400
Subject: [PATCH] Bug 1041471 - Call CancelAnimation() on a touch-cancel.
 r=kats

---
 gfx/layers/apz/src/AsyncPanZoomController.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index 4ac2d0af088..4b89a9c338b 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -1147,7 +1147,7 @@ nsEventStatus AsyncPanZoomController::OnTouchEnd(const MultiTouchInput& aEvent)
 nsEventStatus AsyncPanZoomController::OnTouchCancel(const MultiTouchInput& aEvent) {
   APZC_LOG("%p got a touch-cancel in state %d\n", this, mState);
   OnTouchEndOrCancel();
-  SetState(NOTHING);
+  CancelAnimation();
   return nsEventStatus_eConsumeNoDefault;
 }