Mark touchcancel events as uncancelable

content/renderer/pepper/event_conversion.cc

 // Copyright (c) 2012 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/renderer/pepper/event_conversion.h"
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/strings/utf_string_conversions.h"
+#include "content/common/input/web_touch_event_traits.h"
 #include "content/renderer/pepper/common.h"
 #include "content/renderer/pepper/usb_key_code_conversion.h"
 #include "ppapi/c/pp_input_event.h"
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 using ppapi::EventTimeToPPTimeTicks;
@@ skipping 257 matching lines @@
     pt.radiusY = pp_pt.radius.y;
     pt.rotationAngle = pp_pt.rotation_angle;
     web_touches[i] = pt;
     (*web_touches_length)++;
   }
 }
 
 WebTouchEvent* BuildTouchEvent(const InputEventData& event) {
   WebTouchEvent* web_event = new WebTouchEvent();
   WebTouchPoint::State state = WebTouchPoint::StateUndefined;
+  WebInputEvent::Type type = WebInputEvent::Undefined;
   switch (event.event_type) {
     case PP_INPUTEVENT_TYPE_TOUCHSTART:
-      web_event->type = WebInputEvent::TouchStart;
+      type = WebInputEvent::TouchStart;
       state = WebTouchPoint::StatePressed;
       break;
     case PP_INPUTEVENT_TYPE_TOUCHMOVE:
-      web_event->type = WebInputEvent::TouchMove;
+      type = WebInputEvent::TouchMove;
       state = WebTouchPoint::StateMoved;
       break;
     case PP_INPUTEVENT_TYPE_TOUCHEND:
-      web_event->type = WebInputEvent::TouchEnd;
+      type = WebInputEvent::TouchEnd;
       state = WebTouchPoint::StateReleased;
       break;
     case PP_INPUTEVENT_TYPE_TOUCHCANCEL:
-      web_event->type = WebInputEvent::TouchCancel;
+      type = WebInputEvent::TouchCancel;
       state = WebTouchPoint::StateCancelled;
       break;
     default:
       NOTREACHED();
   }
+  WebTouchEventTraits::ResetType(
+      type, PPTimeTicksToEventTime(event.event_time_stamp), web_event);
 
   TouchStateMap states_map;
   for (uint32_t i = 0; i < event.changed_touches.size(); i++)
     states_map[event.changed_touches[i].id] = state;
 
-  web_event->timeStampSeconds = PPTimeTicksToEventTime(event.event_time_stamp);
-
   SetWebTouchPoints(event.changed_touches,
                     states_map,
                     web_event->changedTouches,
                     &web_event->changedTouchesLength);
 
   SetWebTouchPoints(
       event.touches, states_map, web_event->touches, &web_event->touchesLength);
 
   SetWebTouchPoints(event.target_touches,
                     states_map,
@@ skipping 398 matching lines @@
     case WebInputEvent::TouchStart:
       return PP_INPUTEVENT_CLASS_TOUCH;
     case WebInputEvent::Undefined:
     default:
       NOTREACHED();
       return PP_InputEvent_Class(0);
   }
 }
 
 }  // namespace content