Handle floating point coordinates from ozone to exosphere

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"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 
 namespace exo {
 namespace {
 
 // Helper function that returns an iterator to the first item in |vector|
 // with |value|.
 template <typename T, typename U>
 typename T::iterator FindVectorItem(T& vector, U value) {
   return std::find(vector.begin(), vector.end(), value);
 }
 
 // Helper function that returns true if |vector| contains an item with |value|.
 template <typename T, typename U>
 bool VectorContainsItem(T& vector, U value) {
   return FindVectorItem(vector, value) != vector.end();
 }
 
+gfx::PointF EventLocationInWindow(ui::TouchEvent* event, aura::Window* window) {
+  ui::Layer* root = window->GetRootWindow()->layer();
+  ui::Layer* target = window->layer();
+
+  gfx::Transform transform;
+  target->GetTargetTransformRelativeTo(root, &transform);
+  auto point = gfx::Point3F(event->root_location_f());
+  transform.TransformPointReverse(&point);
+  return point.AsPointF();
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Touch, public:
 
 Touch::Touch(TouchDelegate* delegate) : delegate_(delegate) {
   WMHelper::GetInstance()->AddPreTargetHandler(this);
 }
 
 Touch::~Touch() {
@@ skipping 30 matching lines @@
         DCHECK(!focus_);
         focus_ = target;
         focus_->AddSurfaceObserver(this);
       }
 
       DCHECK(!VectorContainsItem(touch_points_, event->touch_id()));
       touch_points_.push_back(event->touch_id());
 
       // Convert location to focus surface coordinate space.
       DCHECK(focus_);
-      gfx::Point location = event->location();
-      aura::Window::ConvertPointToTarget(target->window(), focus_->window(),
-                                         &location);
+      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);
       if (stylus_delegate_ &&
           event->pointer_details().pointer_type !=
               ui::EventPointerType::POINTER_TYPE_TOUCH) {
         stylus_delegate_->OnTouchTool(event->touch_id(),
                                       event->pointer_details().pointer_type);
@@ skipping 15 matching lines @@
 
       delegate_->OnTouchUp(event->time_stamp(), event->touch_id());
     } break;
     case ui::ET_TOUCH_MOVED: {
       auto it = FindVectorItem(touch_points_, event->touch_id());
       if (it == touch_points_.end())
         return;
 
       DCHECK(focus_);
       // Convert location to focus surface coordinate space.
-      gfx::Point location = event->location();
-      aura::Window::ConvertPointToTarget(
-          static_cast<aura::Window*>(event->target()), focus_->window(),
-          &location);
-
+      gfx::PointF location = EventLocationInWindow(event, focus_->window());
       delegate_->OnTouchMotion(event->time_stamp(), event->touch_id(),
                                location);
       send_details = true;
     } break;
     case ui::ET_TOUCH_CANCELLED: {
       auto it = FindVectorItem(touch_points_, event->touch_id());
       if (it == touch_points_.end())
         return;
 
       DCHECK(focus_);
@@ skipping 51 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