Mark touchcancel events as uncancelable

content/browser/renderer_host/input/web_input_event_util.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 
 using blink::WebGestureEvent;
 using blink::WebInputEvent;
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 using ui::MotionEvent;
 
 namespace {
@@ skipping 191 matching lines @@
                    sizeof(event->keyIdentifier),
                    "U+%04X",
                    base::ToUpperASCII(static_cast<int>(windows_key_code)));
   }
 }
 
 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(),
                static_cast<size_t>(WebTouchEvent::touchesLengthCap));
   DCHECK_GT(result.touchesLength, 0U);
 
   for (size_t i = 0; i < result.touchesLength; ++i)
     result.touches[i] = CreateWebTouchPoint(event, i);
 
   return result;
@@ skipping 90 matching lines @@
       break;
     default:
       NOTREACHED() << "ui::EventType provided wasn't a valid gesture event.";
       break;
   }
 
   return gesture;
 }
 
 }  // namespace content