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 ScaleFactorForDisplay(Window* window) {
+  // TODO(riajiang): Change to use display::GetDisplayWithDisplayId() after
+  // https://codereview.chromium.org/2361283002/ is landed.
+  return display::Screen::GetScreen()
+      ->GetDisplayNearestWindow(window)
+      .device_scale_factor();
+}
+
 }  // 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 = ScaleFactorForDisplay(window);
+  if (device_scale_factor == 1.f) {

[sky, 2016/11/10 23:55:15]

Again, this isn't performance sensitive code, so I would rather you go on the
side of maintainable code. By that I mean don't have separate branches in any of
this code. Always do the conversion, even if it ends up a no-op.

[riajiang, 2016/11/11 19:41:21]

Okay makes sense, done.

+    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 = ScaleFactorForDisplay(window);
+  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 710 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. (http://crbug.com/600815)
   /*
   Window* window = GetWindowByServerId(window_id);
   if (window) {
     WindowPrivate(window).LocalSetClientArea(
         new_client_area,
         new_additional_client_areas.To<std::vector<gfx::Rect>>());
   }
   */
 }
 
@@ skipping 336 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.
+// (http://crbug.com/646942)
 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 = ScaleFactorForDisplay(window);
+    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(),

[sky, 2016/11/10 23:55:15]

Don't offset.x/y need to be convered?

[riajiang, 2016/11/11 19:41:21]

When I was converting offset, browser tabs were not at the right positions tho.
I'll look into it more in the window positioning bug (http://crbugs.com/646932).
Added a TODO.

+              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