Index: content/browser/frame_host/render_widget_host_view_guest.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc |
index c7ef31b53cee8d0843133d6b67ab3e008c0a8250..26819f88e6b31fad673a6ad52e679cf1f359e275 100644 |
--- a/content/browser/frame_host/render_widget_host_view_guest.cc |
+++ b/content/browser/frame_host/render_widget_host_view_guest.cc |
@@ -13,6 +13,7 @@ |
#include "content/common/frame_messages.h" |
#include "content/common/gpu/gpu_messages.h" |
#include "content/common/host_shared_bitmap_manager.h" |
+#include "content/common/input/web_touch_event_traits.h" |
#include "content/common/view_messages.h" |
#include "content/common/webplugin_geometry.h" |
#include "content/public/common/content_switches.h" |
@@ -531,8 +532,12 @@ void RenderWidgetHostViewGuest::DispatchCancelTouchEvent( |
return; |
blink::WebTouchEvent cancel_event; |
- cancel_event.type = blink::WebInputEvent::TouchCancel; |
- cancel_event.timeStampSeconds = event->time_stamp().InSecondsF(); |
+ // FIXME: This event has no touches in it. Don't we need to know what |
+ // touches are currently active in order to cancel them all properly? |
+ WebTouchEventTraits::ResetType(&cancel_event, |
+ blink::WebInputEvent::TouchCancel, |
+ event->time_stamp().InSecondsF(), |
+ WebTouchEventTraits::IGNORE_TOUCHES_STATE); |
host_->ForwardTouchEventWithLatencyInfo(cancel_event, *event->latency()); |
jdduke (slow)
2014/04/23 21:55:47
Hmm, yeah, at the least this should be touchesLeng
Rick Byers
2014/04/23 23:15:35
But then there's the question of what the co-ordin
jdduke (slow)
2014/04/23 23:29:49
Sounds good, yeah, I'm not super familiar with th
|
} |