Scale client area, hit test mask and bounds by device_scale_factor.

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 20 matching lines @@
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_client_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/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
 #if defined(LoWord)
 #undef LoWord
 #endif
 
@@ skipping 59 matching lines @@
 }
 
 WindowTreeHostMus* GetWindowTreeHostMus(WindowMus* window) {
   return GetWindowTreeHostMus(window->GetWindow());
 }
 
 bool IsInternalProperty(const void* key) {
   return key == client::kModalKey;
 }
 
+// Helper function to get the device_scale_factor() of the display::Display
+// with |display_id|.
+float DeviceScaleFactorForDisplay(int64_t display_id) {
+  // TODO(riajiang): Change to use display::GetDisplayWithDisplayId() after
+  // https://codereview.chromium.org/2361283002/ is landed.
+  std::vector<display::Display> displays =
+      display::Screen::GetScreen()->GetAllDisplays();
+  auto iter = std::find_if(displays.begin(), displays.end(),

[sky, 2016/11/09 00:21:13]

When this function is used you always have a window. Can you use
display::Screen::GetScreen()->GetDisplayNearestWindow(window()).device_scale_factor()
?

[riajiang, 2016/11/09 21:07:08]

Changed to use GetDisplayNearestWindow. Kept the TODO since I'm not sure if it
still makes more sense to use GetDisplayWithDisplayId() in the future
(aura::Window doesn't have a display_id)? 

+                           [display_id](const display::Display& display) {
+                             return display.id() == display_id;
+                           });
+  if (iter != displays.end())
+    return iter->device_scale_factor();
+  return 1.f;
+}
+
 }  // namespace
 
 WindowTreeClient::WindowTreeClient(
     WindowTreeClientDelegate* delegate,
     WindowManagerDelegate* window_manager_delegate,
     mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request)
     : client_id_(0),
       next_window_id_(1),
       next_change_id_(1),
       delegate_(delegate),
@@ skipping 67 matching lines @@
   factory->CreateWindowTree(GetProxy(&window_tree),
                             binding_.CreateInterfacePtrAndBind());
   SetWindowTree(std::move(window_tree));
 }
 
 void WindowTreeClient::SetClientArea(
     Window* window,
     const gfx::Insets& client_area,
     const std::vector<gfx::Rect>& additional_client_areas) {
   DCHECK(tree_);
-  tree_->SetClientArea(WindowMus::Get(window)->server_id(), client_area,
-                       additional_client_areas);
+  float device_scale_factor =
+      DeviceScaleFactorForDisplay(GetWindowTreeHostMus(window)->display_id());

[sky, 2016/11/09 00:21:13]

GetWindowTreeHostMus might return null.

[riajiang, 2016/11/09 21:07:08]

Not using GetWindowTreeHostMus anymore since changed to use
GetDisplayNearestWindow to get the display.

+  if (device_scale_factor == 1.f) {
+    tree_->SetClientArea(WindowMus::Get(window)->server_id(), client_area,
+                         additional_client_areas);
+  } else {
+    std::vector<gfx::Rect> additional_client_areas_in_pixel;
+    for (const gfx::Rect& area : additional_client_areas) {
+      additional_client_areas_in_pixel.push_back(
+          gfx::ConvertRectToPixel(device_scale_factor, area));
+    }
+    tree_->SetClientArea(
+        WindowMus::Get(window)->server_id(),
+        gfx::ConvertInsetsToPixel(device_scale_factor, client_area),
+        additional_client_areas_in_pixel);
+  }
 }
 
 void WindowTreeClient::SetHitTestMask(Window* window, const gfx::Rect& mask) {
   DCHECK(tree_);
-  tree_->SetHitTestMask(WindowMus::Get(window)->server_id(), mask);
+  float device_scale_factor =
+      DeviceScaleFactorForDisplay(GetWindowTreeHostMus(window)->display_id());
+  if (device_scale_factor == 1.f) {
+    tree_->SetHitTestMask(WindowMus::Get(window)->server_id(), mask);
+  } else {
+    tree_->SetHitTestMask(WindowMus::Get(window)->server_id(),
+                          gfx::ConvertRectToPixel(device_scale_factor, mask));
+  }
 }
 
 void WindowTreeClient::ClearHitTestMask(Window* window) {
   DCHECK(tree_);
   tree_->SetHitTestMask(WindowMus::Get(window)->server_id(), base::nullopt);
 }
 
 void WindowTreeClient::SetCanFocus(Window* window, bool can_focus) {
   DCHECK(tree_);
   DCHECK(window);
@@ skipping 716 matching lines @@
     return;
 
   SetWindowBoundsFromServer(window, new_bounds);
 }
 
 void WindowTreeClient::OnClientAreaChanged(
     uint32_t window_id,
     const gfx::Insets& new_client_area,
     mojo::Array<gfx::Rect> new_additional_client_areas) {
   // TODO: client area.
+  // TODO(riajiang): Convert from pixel to DIP.
   /*
   Window* window = GetWindowByServerId(window_id);
   if (window) {
     WindowPrivate(window).LocalSetClientArea(
         new_client_area,
         new_additional_client_areas.To<std::vector<gfx::Rect>>());
   }
   */
 }
 
@@ skipping 338 matching lines @@
   }
   */
 }
 
 void WindowTreeClient::WmDisplayModified(const display::Display& display) {
   DCHECK(window_manager_delegate_);
   // TODO(sky): this should likely route to WindowTreeHost.
   window_manager_delegate_->OnWmDisplayModified(display);
 }
 
+// TODO(riajiang): Convert between pixel and DIP for window bounds properly.
 void WindowTreeClient::WmSetBounds(uint32_t change_id,
                                    Id window_id,
                                    const gfx::Rect& transit_bounds) {
   WindowMus* window = GetWindowByServerId(window_id);
   bool result = false;
   if (window) {
     DCHECK(window_manager_delegate_);
     gfx::Rect bounds = transit_bounds;
     // TODO: this needs to trigger scheduling a bounds change on |window|.
     result =
@@ skipping 146 matching lines @@
 void WindowTreeClient::ActivateNextWindow() {
   if (window_manager_internal_client_)
     window_manager_internal_client_->ActivateNextWindow();
 }
 
 void WindowTreeClient::SetUnderlaySurfaceOffsetAndExtendedHitArea(
     Window* window,
     const gfx::Vector2d& offset,
     const gfx::Insets& hit_area) {
   if (window_manager_internal_client_) {
-    window_manager_internal_client_->SetUnderlaySurfaceOffsetAndExtendedHitArea(
-        WindowMus::Get(window)->server_id(), offset.x(), offset.y(), hit_area);
+    float device_scale_factor =
+        DeviceScaleFactorForDisplay(GetWindowTreeHostMus(window)->display_id());
+    if (device_scale_factor == 1.f) {
+      window_manager_internal_client_
+          ->SetUnderlaySurfaceOffsetAndExtendedHitArea(
+              WindowMus::Get(window)->server_id(), offset.x(), offset.y(),
+              hit_area);
+    } else {
+      window_manager_internal_client_
+          ->SetUnderlaySurfaceOffsetAndExtendedHitArea(
+              WindowMus::Get(window)->server_id(), offset.x(), offset.y(),
+              gfx::ConvertInsetsToDIP(device_scale_factor, hit_area));
+    }
   }
 }
 
 void WindowTreeClient::OnWindowTreeHostBoundsWillChange(
     WindowTreeHostMus* window_tree_host,
     const gfx::Rect& bounds) {
   ScheduleInFlightBoundsChange(WindowMus::Get(window_tree_host->window()),
                                window_tree_host->GetBounds(), bounds);
 }
 
@@ skipping 52 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