Bug 1062438 - Hamachi asserting on unknown touch type. r=mwu, a=bajaj
authorMason Chang <mchang@mozilla.com>
Wed, 03 Sep 2014 11:00:56 -0700
changeset 224676 d448400b0a68d460ad6e92272c37a0c6ca466825
parent 224675 a509add936a5acb8c74f6314c7130c8e1532005d
child 224677 f097e5b681ac8667ea1878d092d6fa04e9163e1f
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmwu, bajaj
bugs1062438
milestone34.0a2
Bug 1062438 - Hamachi asserting on unknown touch type. r=mwu, a=bajaj
widget/gonk/nsAppShell.cpp
--- a/widget/gonk/nsAppShell.cpp
+++ b/widget/gonk/nsAppShell.cpp
@@ -700,16 +700,21 @@ GeckoInputDispatcher::notifyMotion(const
     case AMOTION_EVENT_ACTION_UP:
     case AMOTION_EVENT_ACTION_POINTER_UP:
         touchType = MultiTouchInput::MULTITOUCH_END;
         break;
     case AMOTION_EVENT_ACTION_OUTSIDE:
     case AMOTION_EVENT_ACTION_CANCEL:
         touchType = MultiTouchInput::MULTITOUCH_CANCEL;
         break;
+    case AMOTION_EVENT_ACTION_HOVER_EXIT:
+    case AMOTION_EVENT_ACTION_HOVER_ENTER:
+    case AMOTION_EVENT_ACTION_HOVER_MOVE:
+        NS_WARNING("Ignoring hover touch events");
+        return;
     default:
         MOZ_ASSERT_UNREACHABLE("Could not assign a touch type");
         break;
     }
 
     MultiTouchInput touchData(touchType, time, timestamp, modifiers);
 
     // For touch ends, we have to filter out which finger is actually