Add the actual location coordinates to the touch cancel event

ui/aura/window_event_dispatcher.cc

 // Copyright 2014 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/aura/window_event_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 122 matching lines @@
   DispatchDetails details =
       DispatchEvent(focused_window ? focused_window : window(), &event);
   if (details.dispatcher_destroyed)
     return;
 }
 
 void WindowEventDispatcher::DispatchGestureEvent(ui::GestureEvent* event) {
   DispatchDetails details = DispatchHeldEvents();
   if (details.dispatcher_destroyed)
     return;
-
   Window* target = GetGestureTarget(event);
   if (target) {
     event->ConvertLocationToTarget(window(), target);
     DispatchDetails details = DispatchEvent(target, event);
     if (details.dispatcher_destroyed)
       return;
   }
 }
 
 DispatchDetails WindowEventDispatcher::DispatchMouseExitAtPoint(
@@ skipping 276 matching lines @@
   return window();
 }
 
 void WindowEventDispatcher::PrepareEventForDispatch(ui::Event* event) {
   if (dispatching_held_event_) {
     // The held events are already in |window()|'s coordinate system. So it is
     // not necessary to apply the transform to convert from the host's
     // coordinate system to |window()|'s coordinate system.
     return;
   }
-  if (event->IsMouseEvent() ||
-      event->IsScrollEvent() ||
-      event->IsTouchEvent() ||
-      event->IsGestureEvent()) {
+  if (event->IsLocatedEvent()) {
     TransformEventForDeviceScaleFactor(static_cast<ui::LocatedEvent*>(event));
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowEventDispatcher, ui::EventDispatcherDelegate implementation:
 
 bool WindowEventDispatcher::CanDispatchToTarget(ui::EventTarget* target) {
   return event_dispatch_target_ == target;
 }
@@ skipping 69 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WindowEventDispatcher, ui::GestureEventHelper implementation:
 
 bool WindowEventDispatcher::CanDispatchToConsumer(
     ui::GestureConsumer* consumer) {
   Window* consumer_window = ConsumerToWindow(consumer);
   return (consumer_window && consumer_window->GetRootWindow() == window());
 }
 
 void WindowEventDispatcher::DispatchCancelTouchEvent(ui::TouchEvent* event) {
+  // The touchcancel event's location is based on the last known location of
+  // the pointer, in dips. OnEventFromSource expects events with co-ordinates
+  // in raw pixels, so we convert back to raw pixels here.
+  event->UpdateForRootTransform(host_->GetRootTransform());
   DispatchDetails details = OnEventFromSource(event);
   if (details.dispatcher_destroyed)
     return;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowEventDispatcher, WindowObserver implementation:
 
 void WindowEventDispatcher::OnWindowDestroying(Window* window) {
   if (!host_->window()->Contains(window))
@@ skipping 355 matching lines @@
     if (!ui::GestureRecognizer::Get()->ProcessTouchEventPreDispatch(orig_event,
                                                                     target)) {
       event->StopPropagation();
     }
   }
 
   PreDispatchLocatedEvent(target, event);
 }
 
 }  // namespace aura