Remove screen dependency from font_render_params_linux

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/font_render_params.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"
 
@@ skipping 67 matching lines @@
     XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
 
     if (ui::PlatformEventSource::GetInstance())
       ui::PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
     XRRSelectInput(xdisplay_,
                    x_root_window_,
                    RRScreenChangeNotifyMask |
                    RROutputChangeNotifyMask |
                    RRCrtcChangeNotifyMask);
 
-    displays_ = BuildDisplaysFromXRandRInfo();
+    SetDisplaysInternal(BuildDisplaysFromXRandRInfo());
   } else {
-    displays_ = GetFallbackDisplayList();
+    SetDisplaysInternal(GetFallbackDisplayList());
   }
 }
 
 DesktopScreenX11::~DesktopScreenX11() {
   if (has_xrandr_ && ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, gfx::Screen implementation:
@@ skipping 236 matching lines @@
   }
 
   if (displays.empty())
     return GetFallbackDisplayList();
 
   return displays;
 }
 
 void DesktopScreenX11::ConfigureTimerFired() {
   std::vector<gfx::Display> old_displays = displays_;
-  displays_ = BuildDisplaysFromXRandRInfo();
+  SetDisplaysInternal(BuildDisplaysFromXRandRInfo());
+  change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
+}
 
-  change_notifier_.NotifyDisplaysChanged(old_displays, displays_);
+void DesktopScreenX11::SetDisplaysInternal(
+    const std::vector<gfx::Display>& displays) {
+  displays_ = displays;
+  gfx::SetFontRenderParamsDeviceScaleFactor(
+      GetPrimaryDisplay().device_scale_factor());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views