ozone: dri: Remove distinction between root_location and location

ui/ozone/platform/dri/dri_window.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/ozone/platform/dri/dri_window.h"
 
 #include "base/bind.h"
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/ozone/evdev/event_factory_evdev.h"
@@ skipping 104 matching lines @@
   DCHECK(ne);
   Event* event = static_cast<Event*>(ne);
 
   // If there is a grab, capture events here.
   gfx::AcceleratedWidget grabber = window_manager_->event_grabber();
   if (grabber != gfx::kNullAcceleratedWidget)
     return grabber == widget_;
 
   if (event->IsLocatedEvent()) {
     LocatedEvent* located_event = static_cast<LocatedEvent*>(event);
-    return bounds_.Contains(
-        gfx::ToFlooredPoint(located_event->root_location()));
+    return bounds_.Contains(gfx::ToFlooredPoint(located_event->location()));
   }
 
   // TODO(spang): For non-ash builds we would need smarter keyboard focus.
   return true;
 }
 
 uint32_t DriWindow::DispatchEvent(const PlatformEvent& native_event) {
   DCHECK(native_event);
 
   Event* event = static_cast<Event*>(native_event);
   if (event->IsLocatedEvent()) {
     // Make the event location relative to this window's origin.
     LocatedEvent* located_event = static_cast<LocatedEvent*>(event);
-    gfx::PointF location = located_event->root_location();
+    gfx::PointF location = located_event->location();
     location -= bounds_.OffsetFromOrigin();
     located_event->set_location(location);
+    located_event->set_root_location(location);
   }
   DispatchEventFromNativeUiEvent(
       native_event, base::Bind(&PlatformWindowDelegate::DispatchEvent,
                                base::Unretained(delegate_)));
   return POST_DISPATCH_STOP_PROPAGATION;
 }
 
 void DriWindow::OnChannelEstablished() {
   sender_->Send(new OzoneGpuMsg_CreateWindowDelegate(widget_));
   sender_->Send(new OzoneGpuMsg_WindowBoundsChanged(widget_, bounds_));
 
   DriCursor* dri_cursor = window_manager_->cursor();
   if (dri_cursor->GetCursorWindow() == widget_)
     dri_cursor->ShowCursor();
 }
 
 void DriWindow::OnChannelDestroyed() {
 }
 
 }  // namespace ui