mus/views: Fix creating gfx::Display in high-dpi.

ui/views/mus/screen_mus.cc

 // Copyright 2016 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/views/mus/screen_mus.h"
 
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/gfx/display_finder.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<gfx::Display, mus::mojom::DisplayPtr> {
   static gfx::Display Convert(const mus::mojom::DisplayPtr& input) {
-    gfx::Display result(input->id, input->bounds.To<gfx::Rect>());
-    result.set_work_area(input->work_area.To<gfx::Rect>());
+    gfx::Display result(input->id);
+    gfx::Rect pixel_bounds = input->bounds.To<gfx::Rect>();
+    gfx::Rect pixel_work_area = input->work_area.To<gfx::Rect>();
+    float pixel_ratio = input->device_pixel_ratio;
+
+    gfx::Rect dip_bounds =
+        gfx::ScaleToEnclosingRect(pixel_bounds, 1.f / pixel_ratio);
+    gfx::Rect dip_work_area =
+        gfx::ScaleToEnclosingRect(pixel_work_area, 1.f / pixel_ratio);
+    result.set_bounds(dip_bounds);
+    result.set_work_area(dip_work_area);
     result.set_device_scale_factor(input->device_pixel_ratio);
+
     switch (input->rotation) {
       case mus::mojom::Rotation::VALUE_0:
         result.set_rotation(gfx::Display::ROTATE_0);
         break;
       case mus::mojom::Rotation::VALUE_90:
         result.set_rotation(gfx::Display::ROTATE_90);
         break;
       case mus::mojom::Rotation::VALUE_180:
         result.set_rotation(gfx::Display::ROTATE_180);
         break;
@@ skipping 195 matching lines @@
   DCHECK_NE(-1, index);
   // Another display must become primary before the existing primary is
   // removed.
   DCHECK_NE(index, primary_display_index_);
   const gfx::Display display = displays_[index];
   FOR_EACH_OBSERVER(gfx::DisplayObserver, observers_,
                     OnDisplayRemoved(display));
 }
 
 }  // namespace views