device scale factor detection: use gtk-xft-dpi consistently

ui/views/widget/desktop_aura/desktop_screen_x11.cc

 // Copyright (c) 2012 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/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
 #undef RootWindow
 
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/display/util/display_util.h"
 #include "ui/display/util/x11/edid_parser_x11.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/x/x11_types.h"
+#include "ui/views/linux_ui/linux_ui.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"
 
 namespace {
 
 // The delay to perform configuration after RRNotify.  See the comment
 // in |Dispatch()|.
 const int64 kConfigureDelayMs = 500;
 
-// TODO(oshima): Consider using gtk-xft-dpi instead.
-float GetDeviceScaleFactor(int screen_pixels, int screen_mm) {
-  const int kCSSDefaultDPI = 96;
-  const float kInchInMm = 25.4f;
-
-  float screen_inches = screen_mm / kInchInMm;
-  float screen_dpi = screen_pixels / screen_inches;
-  float scale = screen_dpi / kCSSDefaultDPI;
-
-  return ui::GetScaleForScaleFactor(ui::GetSupportedScaleFactor(scale));
-}
-
-float GetDeviceScaleFactor() {
-  gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
-  return display.device_scale_factor();
-}
-
 gfx::Point PixelToDIPPoint(const gfx::Point& pixel_point) {
-  return ToFlooredPoint(ScalePoint(pixel_point, 1.0f / GetDeviceScaleFactor()));
+  return ToFlooredPoint(ScalePoint(pixel_point,
+      1.0f / views::LinuxUI::instance()->GetDeviceScaleFactor()));
 }
 
 gfx::Point DIPToPixelPoint(const gfx::Point& dip_point) {
-  return ToFlooredPoint(gfx::ScalePoint(dip_point, GetDeviceScaleFactor()));
+  return ToFlooredPoint(gfx::ScalePoint(dip_point,
+      views::LinuxUI::instance()->GetDeviceScaleFactor()));
 }
 
 std::vector<gfx::Display> GetFallbackDisplayList() {
   ::XDisplay* display = gfx::GetXDisplay();
   ::Screen* screen = DefaultScreenOfDisplay(display);
   int width = WidthOfScreen(screen);
   int height = HeightOfScreen(screen);
   gfx::Size physical_size(WidthMMOfScreen(screen), HeightMMOfScreen(screen));
 
   gfx::Rect bounds_in_pixels(0, 0, width, height);
   gfx::Display gfx_display(0, bounds_in_pixels);
   if (!gfx::Display::HasForceDeviceScaleFactor() &&
       !ui::IsDisplaySizeBlackListed(physical_size)) {
-    float device_scale_factor = GetDeviceScaleFactor(
-        width, physical_size.width());
+    float device_scale_factor =
+        views::LinuxUI::instance()->GetDeviceScaleFactor();
     DCHECK_LE(1.0f, device_scale_factor);
     gfx_display.SetScaleAndBounds(device_scale_factor, bounds_in_pixels);
   }
 
   return std::vector<gfx::Display>(1, gfx_display);
 }
 
 }  // namespace
 
 namespace views {
@@ skipping 202 matching lines @@
   bool has_work_area = false;
   gfx::Rect work_area_in_pixels;
   std::vector<int> value;
   if (ui::GetIntArrayProperty(x_root_window_, "_NET_WORKAREA", &value) &&
       value.size() >= 4) {
     work_area_in_pixels = gfx::Rect(value[0], value[1], value[2], value[3]);
     has_work_area = true;
   }
 
   float device_scale_factor = 1.0f;
+  {

[Elliot Glaysher, 2015/04/09 16:47:27]

Is there a reason this is in a block instead of just float device_scale_factor =
views::LinuxUI::instance()->GetDeviceScaleFactor()?

(It looks like you started out with a temp vector in here, but now that that's
gone, there's no reason to have this scope.)

[stapelberg, 2015/04/09 18:11:29]

Done.

+    // As per-display scale factor is not supported right now,
+    // the X11 root window's scale factor is always used.
+    device_scale_factor = views::LinuxUI::instance()->GetDeviceScaleFactor();
+  }
   for (int i = 0; i < resources->noutput; ++i) {
     RROutput output_id = resources->outputs[i];
     gfx::XScopedPtr<XRROutputInfo,
                     gfx::XObjectDeleter<XRROutputInfo, void, XRRFreeOutputInfo>>
         output_info(XRRGetOutputInfo(xdisplay_, resources.get(), output_id));
 
     bool is_connected = (output_info->connection == RR_Connected);
     if (!is_connected)
       continue;
 
     if (output_info->crtc) {
       gfx::XScopedPtr<XRRCrtcInfo,
                       gfx::XObjectDeleter<XRRCrtcInfo, void, XRRFreeCrtcInfo>>
           crtc(XRRGetCrtcInfo(xdisplay_, resources.get(), output_info->crtc));
 
       int64 display_id = -1;
       if (!ui::GetDisplayId(output_id, static_cast<uint8>(i), &display_id)) {
         // It isn't ideal, but if we can't parse the EDID data, fallback on the
         // display number.
         display_id = i;
       }
 
       gfx::Rect crtc_bounds(crtc->x, crtc->y, crtc->width, crtc->height);
       gfx::Display display(display_id, crtc_bounds);
 
       if (!gfx::Display::HasForceDeviceScaleFactor()) {
-        if (i == 0 && !ui::IsDisplaySizeBlackListed(
-            gfx::Size(output_info->mm_width, output_info->mm_height))) {
-          // As per display scale factor is not supported right now,
-          // the primary display's scale factor is always used.
-          device_scale_factor = GetDeviceScaleFactor(crtc->width,
-                                                     output_info->mm_width);
-          DCHECK_LE(1.0f, device_scale_factor);
-        }
         display.SetScaleAndBounds(device_scale_factor, crtc_bounds);
       }
 
       if (has_work_area) {
         gfx::Rect intersection_in_pixels = crtc_bounds;
         intersection_in_pixels.Intersect(work_area_in_pixels);
         // SetScaleAndBounds() above does the conversion from pixels to DIP for
         // us, but set_work_area does not, so we need to do it here.
         display.set_work_area(gfx::Rect(
             gfx::ToFlooredPoint(
@@ skipping 36 matching lines @@
   change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views