Merge 285580 "Currently, destroying a ui::TouchEvent removes its..."

ui/events/event.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 "ui/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #endif
@@ skipping 438 matching lines @@
       0,
       base::TimeTicks::FromInternalValue(time_stamp().ToInternalValue()),
       1);
 
 #if defined(USE_X11)
   XIDeviceEvent* xiev = static_cast<XIDeviceEvent*>(native_event->xcookie.data);
   source_device_id_ = xiev->deviceid;
 #endif
 
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
+
+  if (type() == ET_TOUCH_PRESSED)
+    IncrementTouchIdRefCount(native_event);
 }
 
 TouchEvent::TouchEvent(EventType type,
                        const gfx::PointF& location,
                        int touch_id,
                        base::TimeDelta time_stamp)
     : LocatedEvent(type, location, location, time_stamp, 0),
       touch_id_(touch_id),
       radius_x_(0.0f),
       radius_y_(0.0f),
@@ skipping 299 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace ui