From 439419821383e13782bfb2df8d6cd2e84e792a5c Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Tue, 10 Feb 2015 16:28:07 -0500
Subject: [PATCH] Bug 1125422 - Correctly determine whether a touch event was
 prevent-defaulted in the chrome process. r=kats

---
 widget/nsBaseWidget.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/widget/nsBaseWidget.cpp b/widget/nsBaseWidget.cpp
index da110c67042..4b16a79343a 100644
--- a/widget/nsBaseWidget.cpp
+++ b/widget/nsBaseWidget.cpp
@@ -950,9 +950,12 @@ nsBaseWidget::DispatchEventForAPZ(WidgetGUIEvent* aEvent,
         = &APZCTreeManager::SetTargetAPZC;
     APZThreadUtils::RunOnControllerThread(NewRunnableMethod(
         mAPZC.get(), setTargetApzcFunc, aInputBlockId, aGuid));
+    bool defaultPrevented = aEvent->AsTouchEvent()
+      ? (nsIPresShell::gPreventMouseEvents || aEvent->mFlags.mMultipleActionsPrevented)
+      : aEvent->mFlags.mDefaultPrevented;
     APZThreadUtils::RunOnControllerThread(NewRunnableMethod(
         mAPZC.get(), &APZCTreeManager::ContentReceivedInputBlock, aInputBlockId,
-        aEvent->mFlags.mDefaultPrevented));
+        defaultPrevented));
   }
 
   return status;