Add id properties to PointerEvent

ash/touch/touch_uma.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 "ash/touch/touch_uma.h"
 
 #include "ash/common/wm_shell.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "ui/aura/env.h"
@@ skipping 101 matching lines @@
 
   position.set_x(std::min(bounds.width() - 1, std::max(0, position.x())));
   position.set_y(std::min(bounds.height() - 1, std::max(0, position.y())));
 
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Ash.TouchPositionX", position.x() / bucket_size_x, 1,
       kBucketCountForLocation, kBucketCountForLocation + 1);
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Ash.TouchPositionY", position.y() / bucket_size_y, 1,
       kBucketCountForLocation, kBucketCountForLocation + 1);
 

[sadrul, 2017/02/07 05:40:41]

It may be better to extract the id here, and just use that in all the places
below.

   if (event.type() == ui::ET_TOUCH_PRESSED) {
     WmShell::Get()->RecordUserMetricsAction(UMA_TOUCHSCREEN_TAP_DOWN);
 
-    details->last_start_time_[event.touch_id()] = event.time_stamp();
-    details->start_touch_position_[event.touch_id()] = event.root_location();
-    details->last_touch_position_[event.touch_id()] = event.location();
+    details->last_start_time_[event.pointer_details().id] = event.time_stamp();
+    details->start_touch_position_[event.pointer_details().id] =
+        event.root_location();
+    details->last_touch_position_[event.pointer_details().id] =
+        event.location();
 
     if (details->last_release_time_.ToInternalValue()) {
       // Measuring the interval between a touch-release and the next
       // touch-start is probably less useful when doing multi-touch (e.g.
       // gestures, or multi-touch friendly apps). So count this only if the user
       // hasn't done any multi-touch during the last 30 seconds.
       base::TimeDelta diff = event.time_stamp() - details->last_mt_time_;
       if (diff.InSeconds() > 30) {
         base::TimeDelta gap = event.time_stamp() - details->last_release_time_;
         UMA_HISTOGRAM_COUNTS_10000("Ash.TouchStartAfterEnd",
                                    gap.InMilliseconds());
       }
     }
 
     // Record the number of touch-points currently active for the window.
     const int kMaxTouchPoints = 10;
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.ActiveTouchPoints",
                                 details->last_start_time_.size(), 1,
                                 kMaxTouchPoints, kMaxTouchPoints + 1);
   } else if (event.type() == ui::ET_TOUCH_RELEASED) {
-    if (details->last_start_time_.count(event.touch_id())) {
+    if (details->last_start_time_.count(event.pointer_details().id)) {
       base::TimeDelta duration =
-          event.time_stamp() - details->last_start_time_[event.touch_id()];
+          event.time_stamp() -
+          details->last_start_time_[event.pointer_details().id];
       // Look for touches that were [almost] stationary for a long time.
       const double kLongStationaryTouchDuration = 10;
       const int kLongStationaryTouchDistanceSquared = 100;
       if (duration.InSecondsF() > kLongStationaryTouchDuration) {
         gfx::Vector2d distance =
             event.root_location() -
-            details->start_touch_position_[event.touch_id()];
+            details->start_touch_position_[event.pointer_details().id];
         if (distance.LengthSquared() < kLongStationaryTouchDistanceSquared) {
           UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.StationaryTouchDuration",
                                       duration.InSeconds(),
                                       kLongStationaryTouchDuration, 1000, 20);
         }
       }
     }
-    details->last_start_time_.erase(event.touch_id());
-    details->last_move_time_.erase(event.touch_id());
-    details->start_touch_position_.erase(event.touch_id());
-    details->last_touch_position_.erase(event.touch_id());
+    details->last_start_time_.erase(event.pointer_details().id);
+    details->last_move_time_.erase(event.pointer_details().id);
+    details->start_touch_position_.erase(event.pointer_details().id);
+    details->last_touch_position_.erase(event.pointer_details().id);
     details->last_release_time_ = event.time_stamp();
   } else if (event.type() == ui::ET_TOUCH_MOVED) {
     int distance = 0;
-    if (details->last_touch_position_.count(event.touch_id())) {
-      gfx::Point lastpos = details->last_touch_position_[event.touch_id()];
+    if (details->last_touch_position_.count(event.pointer_details().id)) {
+      gfx::Point lastpos =
+          details->last_touch_position_[event.pointer_details().id];
       distance =
           std::abs(lastpos.x() - event.x()) + std::abs(lastpos.y() - event.y());
     }
 
-    if (details->last_move_time_.count(event.touch_id())) {
+    if (details->last_move_time_.count(event.pointer_details().id)) {
       base::TimeDelta move_delay =
-          event.time_stamp() - details->last_move_time_[event.touch_id()];
+          event.time_stamp() -
+          details->last_move_time_[event.pointer_details().id];
       UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchMoveInterval",
                                   move_delay.InMilliseconds(), 1, 50, 25);
     }
 
     UMA_HISTOGRAM_CUSTOM_COUNTS("Ash.TouchMoveSteps", distance, 1, 1000, 50);
 
-    details->last_move_time_[event.touch_id()] = event.time_stamp();
-    details->last_touch_position_[event.touch_id()] = event.location();
+    details->last_move_time_[event.pointer_details().id] = event.time_stamp();
+    details->last_touch_position_[event.pointer_details().id] =
+        event.location();
   }
 }
 
 TouchUMA::TouchUMA()
     : is_single_finger_gesture_(false),
       touch_in_progress_(false),
       burst_length_(0) {}
 
 TouchUMA::~TouchUMA() {}
 
@@ skipping 92 matching lines @@
       return GESTURE_OMNIBOX_SCROLL;
     if (event.type() == ui::ET_GESTURE_PINCH_BEGIN)
       return GESTURE_OMNIBOX_PINCH;
     return GESTURE_UNKNOWN;
   }
 
   return GESTURE_UNKNOWN;
 }
 
 }  // namespace ash