Chromium Code Reviews| Index: content/browser/renderer_host/input/web_input_event_util.cc |
| diff --git a/content/browser/renderer_host/input/web_input_event_util.cc b/content/browser/renderer_host/input/web_input_event_util.cc |
| index 8bce2c641c8100189214c7cb8687a4bfc76f029d..4271d9af4f64af6350169674461890a3a8b8f8df 100644 |
| --- a/content/browser/renderer_host/input/web_input_event_util.cc |
| +++ b/content/browser/renderer_host/input/web_input_event_util.cc |
| @@ -5,6 +5,7 @@ |
| #include "content/browser/renderer_host/input/web_input_event_util.h" |
| #include "base/strings/string_util.h" |
| +#include "content/common/input/web_touch_event_traits.h" |
| #include "ui/events/gesture_detection/gesture_event_data.h" |
| #include "ui/events/gesture_detection/motion_event.h" |
| @@ -216,11 +217,10 @@ blink::WebTouchEvent CreateWebTouchEventFromMotionEvent( |
| const ui::MotionEvent& event) { |
| blink::WebTouchEvent result; |
| - result.type = ToWebInputEventType(event.GetAction()); |
| - DCHECK(WebInputEvent::isTouchEventType(result.type)); |
| - |
| - result.timeStampSeconds = |
| - (event.GetEventTime() - base::TimeTicks()).InSecondsF(); |
| + WebTouchEventTraits::ResetType(&result, |
| + ToWebInputEventType(event.GetAction()), |
|
jdduke (slow)
2014/04/23 21:55:47
Yeah, could you run "git cl format" on the patch?
Rick Byers
2014/04/23 23:15:35
Done.
|
| + (event.GetEventTime() - base::TimeTicks()).InSecondsF(), |
| + WebTouchEventTraits::IGNORE_TOUCHES_STATE); |
| result.touchesLength = |
| std::min(event.GetPointerCount(), |