Fix event dispatching offset problem in the client-lib in high-dpi mode. (conversion)

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 24 matching lines @@
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #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_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/ui_base_types.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)
@@ skipping 1090 matching lines @@
     tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::UNHANDLED);
     return;
   }
 
   WindowTreeHostMus* host = GetWindowTreeHostMus(window);
   DCHECK(host);
 
   // The location of the event is relative to |window|. As the event is handed
   // to WindowTreeHost we need it to be relative to WindowTreeHost.
   if (event->IsLocatedEvent()) {
-    gfx::Point host_location = event->AsLocatedEvent()->location();
+    gfx::Point host_location_in_pixels = event->AsLocatedEvent()->location();
+    gfx::Point host_location_in_dip = gfx::ConvertPointToDIP(
+        ScaleFactorForDisplay(window->GetWindow()), host_location_in_pixels);
     aura::Window::ConvertPointToTarget(window->GetWindow(), host->window(),
-                                       &host_location);
-    event->AsLocatedEvent()->set_location(host_location);
+                                       &host_location_in_dip);
+    event->AsLocatedEvent()->set_location(host_location_in_dip);
+    window->GetWindow()->GetHost()->dispatcher()->set_transform_events(false);
   }
 
   EventAckHandler ack_handler(CreateEventResultCallback(event_id));
   // TODO(moshayedi): crbug.com/617222. No need to convert to ui::MouseEvent or
   // ui::TouchEvent once we have proper support for pointer events.
   if (event->IsMousePointerEvent()) {
     if (event->type() == ui::ET_POINTER_WHEEL_CHANGED) {
       ui::MouseWheelEvent mapped_event(*event->AsPointerEvent());
       host->SendEventToProcessor(&mapped_event);
     } else {
@@ skipping 649 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