Add id properties to PointerEvent

components/exo/touch.cc

 // Copyright 2015 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 "components/exo/touch.h"
 
 #include "components/exo/surface.h"
 #include "components/exo/touch_delegate.h"
 #include "components/exo/touch_stylus_delegate.h"
 #include "components/exo/wm_helper.h"
@@ skipping 65 matching lines @@
         return;
 
       // If this is the first touch point then target becomes the focus surface
       // until all touch points have been released.
       if (touch_points_.empty()) {
         DCHECK(!focus_);
         focus_ = target;
         focus_->AddSurfaceObserver(this);
       }
 
-      DCHECK(!VectorContainsItem(touch_points_, event->touch_id()));
-      touch_points_.push_back(event->touch_id());
+      DCHECK(!VectorContainsItem(touch_points_, event->pointer_details().id));
+      touch_points_.push_back(event->pointer_details().id);
 
       // Convert location to focus surface coordinate space.
       DCHECK(focus_);
       gfx::PointF location = EventLocationInWindow(event, focus_->window());
 
       // Generate a touch down event for the focus surface. Note that this can
       // be different from the target surface.
-      delegate_->OnTouchDown(focus_, event->time_stamp(), event->touch_id(),
-                             location);
+      delegate_->OnTouchDown(focus_, event->time_stamp(),
+                             event->pointer_details().id, location);
       if (stylus_delegate_ &&
           event->pointer_details().pointer_type !=
               ui::EventPointerType::POINTER_TYPE_TOUCH) {
-        stylus_delegate_->OnTouchTool(event->touch_id(),
+        stylus_delegate_->OnTouchTool(event->pointer_details().id,
                                       event->pointer_details().pointer_type);
       }
       send_details = true;
     } break;
     case ui::ET_TOUCH_RELEASED: {
-      auto it = FindVectorItem(touch_points_, event->touch_id());
+      auto it = FindVectorItem(touch_points_, event->pointer_details().id);
       if (it == touch_points_.end())
         return;
       touch_points_.erase(it);
 
       // Reset focus surface if this is the last touch point.
       if (touch_points_.empty()) {
         DCHECK(focus_);
         focus_->RemoveSurfaceObserver(this);
         focus_ = nullptr;
       }
 
-      delegate_->OnTouchUp(event->time_stamp(), event->touch_id());
+      delegate_->OnTouchUp(event->time_stamp(), event->pointer_details().id);
     } break;
     case ui::ET_TOUCH_MOVED: {
-      auto it = FindVectorItem(touch_points_, event->touch_id());
+      auto it = FindVectorItem(touch_points_, event->pointer_details().id);
       if (it == touch_points_.end())
         return;
 
       DCHECK(focus_);
       // Convert location to focus surface coordinate space.
       gfx::PointF location = EventLocationInWindow(event, focus_->window());
-      delegate_->OnTouchMotion(event->time_stamp(), event->touch_id(),
+      delegate_->OnTouchMotion(event->time_stamp(), event->pointer_details().id,
                                location);
       send_details = true;
     } break;
     case ui::ET_TOUCH_CANCELLED: {
-      auto it = FindVectorItem(touch_points_, event->touch_id());
+      auto it = FindVectorItem(touch_points_, event->pointer_details().id);
       if (it == touch_points_.end())
         return;
 
       DCHECK(focus_);
       focus_->RemoveSurfaceObserver(this);
       focus_ = nullptr;
 
       // Cancel the full set of touch sequences as soon as one is canceled.
       touch_points_.clear();
       delegate_->OnTouchCancel();
     } break;
     default:
       NOTREACHED();
       return;
   }
   if (send_details) {
-    delegate_->OnTouchShape(event->touch_id(),
+    delegate_->OnTouchShape(event->pointer_details().id,
                             event->pointer_details().radius_x,
                             event->pointer_details().radius_y);
 
     if (stylus_delegate_ &&
         event->pointer_details().pointer_type !=
             ui::EventPointerType::POINTER_TYPE_TOUCH) {
       if (!std::isnan(event->pointer_details().force)) {
-        stylus_delegate_->OnTouchForce(event->time_stamp(), event->touch_id(),
+        stylus_delegate_->OnTouchForce(event->time_stamp(),
+                                       event->pointer_details().id,
                                        event->pointer_details().force);
       }
       stylus_delegate_->OnTouchTilt(
-          event->time_stamp(), event->touch_id(),
+          event->time_stamp(), event->pointer_details().id,
           gfx::Vector2dF(event->pointer_details().tilt_x,
                          event->pointer_details().tilt_y));
     }
   }
   // TODO(denniskempin): Extend ui::TouchEvent to signal end of sequence of
   // touch events to send TouchFrame once after all touches have been updated.
   delegate_->OnTouchFrame();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 16 matching lines @@
 Surface* Touch::GetEffectiveTargetForEvent(ui::Event* event) const {
   Surface* target =
       Surface::AsSurface(static_cast<aura::Window*>(event->target()));
   if (!target)
     return nullptr;
 
   return delegate_->CanAcceptTouchEventsForSurface(target) ? target : nullptr;
 }
 
 }  // namespace exo