WIP: have aura-mus convert to dips before sending out events

ui/aura/mus/window_tree_client.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/mus/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 26 matching lines @@
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_client_observer.h"
 #include "ui/aura/mus/window_tree_client_test_observer.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/compositor/compositor.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
 
 #if defined(HiWord)
 #undef HiWord
 #endif
@@ skipping 1068 matching lines @@
     if (!window || !window->GetWindow()->GetHost()) {
       tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::UNHANDLED);
       return;
     }
     InputMethodMus* input_method = GetWindowTreeHostMus(window)->input_method();
     input_method->DispatchKeyEvent(event->AsKeyEvent(),
                                    CreateEventResultCallback(event_id));
     return;
   }
 
+  // Mus sends screen coordinates, need to convert to DIPs.
+  if (event->IsLocatedEvent() && !roots_.empty()) {
+    // TODO: this isn't right, we need to find the matching host and use it's
+    // scale.
+    const float scale_factor = (*roots_.begin())
+                                   ->GetWindow()
+                                   ->GetHost()
+                                   ->compositor()
+                                   ->device_scale_factor();
+    if (scale_factor != 1) {
+      gfx::Point host_location = gfx::ConvertPointToDIP(
+          scale_factor, event->AsLocatedEvent()->location());
+      event->AsLocatedEvent()->set_location(host_location);
+      gfx::Point root_location = gfx::ConvertPointToDIP(
+          scale_factor, event->AsLocatedEvent()->root_location());
+      event->AsLocatedEvent()->set_root_location(root_location);
+    }
+  }
+
   if (matches_pointer_watcher && has_pointer_watcher_) {
     DCHECK(event->IsPointerEvent());
     delegate_->OnPointerEventObserved(*event->AsPointerEvent(),
                                       window ? window->GetWindow() : nullptr);
   }
 
   // TODO: deal with no window or host here. This could happen if during
   // dispatch a window is deleted or moved. In either case we still need to
   // dispatch. Most likely need the display id.
   if (!window || !window->GetWindow()->GetHost()) {
@@ skipping 673 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura