Mark touchcancel events as uncancelable

content/common/input/synthetic_web_input_event_builders.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/common/input/synthetic_web_input_event_builders.h"
 
 #include "base/logging.h"
+#include "content/common/input/web_touch_event_traits.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace content {
 
 using blink::WebInputEvent;
 using blink::WebKeyboardEvent;
 using blink::WebGestureEvent;
 using blink::WebMouseEvent;
 using blink::WebMouseWheelEvent;
 using blink::WebTouchEvent;
@@ skipping 144 matching lines @@
 int SyntheticWebTouchEvent::PressPoint(float x, float y) {
   if (touchesLength == touchesLengthCap)
     return -1;
   WebTouchPoint& point = touches[touchesLength];
   point.id = touchesLength;
   point.position.x = point.screenPosition.x = x;
   point.position.y = point.screenPosition.y = y;
   point.state = WebTouchPoint::StatePressed;
   point.radiusX = point.radiusY = 1.f;
   ++touchesLength;
-  type = WebInputEvent::TouchStart;
+  WebTouchEventTraits::ResetType(
+      WebInputEvent::TouchStart, timeStampSeconds, this);
   return point.id;
 }
 
 void SyntheticWebTouchEvent::MovePoint(int index, float x, float y) {
   CHECK(index >= 0 && index < touchesLengthCap);
   WebTouchPoint& point = touches[index];
   point.position.x = point.screenPosition.x = x;
   point.position.y = point.screenPosition.y = y;
   touches[index].state = WebTouchPoint::StateMoved;
-  type = WebInputEvent::TouchMove;
+  WebTouchEventTraits::ResetType(
+      WebInputEvent::TouchMove, timeStampSeconds, this);
 }
 
 void SyntheticWebTouchEvent::ReleasePoint(int index) {
   CHECK(index >= 0 && index < touchesLengthCap);
   touches[index].state = WebTouchPoint::StateReleased;
-  type = WebInputEvent::TouchEnd;
+  WebTouchEventTraits::ResetType(
+      WebInputEvent::TouchEnd, timeStampSeconds, this);
 }
 
 void SyntheticWebTouchEvent::CancelPoint(int index) {
   CHECK(index >= 0 && index < touchesLengthCap);
   touches[index].state = WebTouchPoint::StateCancelled;
-  type = WebInputEvent::TouchCancel;
+  WebTouchEventTraits::ResetType(
+      WebInputEvent::TouchCancel, timeStampSeconds, this);
 }
 
 void SyntheticWebTouchEvent::SetTimestamp(base::TimeDelta timestamp) {
   timeStampSeconds = timestamp.InSecondsF();
 }
 
-SyntheticWebTouchEvent SyntheticWebTouchEventBuilder::Build(
-    WebInputEvent::Type type) {
-  DCHECK(WebInputEvent::isTouchEventType(type));
-  SyntheticWebTouchEvent result;
-  result.type = type;
-  return result;
-};
-
 }  // namespace content