Scale the location of drag image for high DPI

ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.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 <map>
 #include <memory>
 #include <vector>
 
 // Include views_test_base.h first because the definition of None in X.h
 // conflicts with the definition of None in gtest-type-util.h
 #include "ui/views/test/views_test_base.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "ui/aura/test/test_screen.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater.h"
 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
@@ skipping 84 matching lines @@
   SimpleTestDragDropClient(aura::Window*,
                            DesktopNativeCursorManager* cursor_manager);
   ~SimpleTestDragDropClient() override;
 
   // Sets |xid| as the topmost window for all mouse positions.
   void SetTopmostXWindow(XID xid);
 
   // Returns true if the move loop is running.
   bool IsMoveLoopRunning();
 
+  Widget* drag_widget() { return DesktopDragDropClientAuraX11::drag_widget(); }
+
  private:
   // DesktopDragDropClientAuraX11:
   std::unique_ptr<X11MoveLoop> CreateMoveLoop(
       X11MoveLoopDelegate* delegate) override;
   XID FindWindowFor(const gfx::Point& screen_point) override;
 
   // The XID of the window which is simulated to be the topmost window.
   XID target_xid_;
 
   // The move loop. Not owned.
@@ skipping 247 matching lines @@
 class DesktopDragDropClientAuraX11Test : public ViewsTestBase {
  public:
   DesktopDragDropClientAuraX11Test() {
   }
 
   ~DesktopDragDropClientAuraX11Test() override {}
 
   int StartDragAndDrop() {
     ui::OSExchangeData data;
     data.SetString(base::ASCIIToUTF16("Test"));
+    SkBitmap drag_bitmap;
+    drag_bitmap.allocN32Pixels(10, 10);
+    gfx::ImageSkia drag_image(gfx::ImageSkia::CreateFrom1xBitmap(drag_bitmap));
+    data.provider().SetDragImage(drag_image, gfx::Vector2d());
 
     return client_->StartDragAndDrop(
         data,
         widget_->GetNativeWindow()->GetRootWindow(),
         widget_->GetNativeWindow(),
         gfx::Point(),
         ui::DragDropTypes::DRAG_COPY,
         ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
   }
 
   // ViewsTestBase:
   void SetUp() override {
     ViewsTestBase::SetUp();
+    views_delegate()->set_use_desktop_native_widgets(true);
 
     // Create widget to initiate the drags.
     widget_.reset(new Widget);
     Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
     params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.native_widget = new DesktopNativeWidgetAura(widget_.get());
     params.bounds = gfx::Rect(100, 100);
     widget_->Init(params);
     widget_->Show();
 
@@ skipping 123 matching lines @@
   // Do another drag and drop to test that the data is properly cleaned up as a
   // result of the XdndFinished message.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::Bind(&BasicStep3,
                                          client(),
                                          toplevel));
   result = StartDragAndDrop();
   EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result);
 }
 
+void HighDPIStep(TestDragDropClient* client) {
+  float scale =
+      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
+  // Start dragging at 100, 100 in native coordinates.
+  gfx::Point mouse_position_in_screen_pixel(100, 100);
+  client->OnMouseMovement(mouse_position_in_screen_pixel, 0,
+                          ui::EventTimeForNow());
+
+  EXPECT_EQ(gfx::ScaleToFlooredPoint(gfx::Point(100, 100), 1.f / scale),
+            client->drag_widget()->GetWindowBoundsInScreen().origin());
+
+  // Drag the mouse down 200 pixels.
+  mouse_position_in_screen_pixel.Offset(200, 0);
+  client->OnMouseMovement(mouse_position_in_screen_pixel, 0,
+                          ui::EventTimeForNow());
+  EXPECT_EQ(gfx::ScaleToFlooredPoint(gfx::Point(300, 100), 1.f / scale),
+            client->drag_widget()->GetWindowBoundsInScreen().origin());
+
+  client->OnMouseReleased();
+}
+
+TEST_F(DesktopDragDropClientAuraX11Test, HighDPI200) {
+  aura::TestScreen* screen =
+      static_cast<aura::TestScreen*>(display::Screen::GetScreen());
+  screen->SetDeviceScaleFactor(2.0f);
+
+  base::MessageLoop::current()->PostTask(FROM_HERE,
+                                         base::Bind(&HighDPIStep, client()));
+  int result = StartDragAndDrop();
+  EXPECT_EQ(ui::DragDropTypes::DRAG_NONE, result);
+}
+
+TEST_F(DesktopDragDropClientAuraX11Test, HighDPI150) {
+  aura::TestScreen* screen =
+      static_cast<aura::TestScreen*>(display::Screen::GetScreen());
+  screen->SetDeviceScaleFactor(1.5f);
+
+  base::MessageLoop::current()->PostTask(FROM_HERE,
+                                         base::Bind(&HighDPIStep, client()));
+  int result = StartDragAndDrop();
+  EXPECT_EQ(ui::DragDropTypes::DRAG_NONE, result);
+}
+
 namespace {
 
 void TargetDoesNotRespondStep2(TestDragDropClient* client) {
   EXPECT_TRUE(client->IsMoveLoopRunning());
 
   XID toplevel = 1;
   ClientMessageEventCollector collector(toplevel, client);
   client->SetTopmostXWindowAndMoveMouse(toplevel);
 
   std::vector<XClientMessageEvent> events = collector.PopAllEvents();
@@ skipping 402 matching lines @@
 // the aura::client::DragDropDelegate is properly notified.
 TEST_F(DesktopDragDropClientAuraX11ChromeSourceTargetTest, CtrlPressed) {
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&ChromeSourceTargetStep2, client(), ui::EF_CONTROL_DOWN));
   int result = StartDragAndDrop();
   EXPECT_EQ(ui::DragDropTypes::DRAG_COPY, result);
 }
 
 }  // namespace views