Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: ui/views/widget/desktop_aura/desktop_screen_x11.cc

Issue 1870873003: Remove screen dependency from font_render_params_linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/widget/desktop_aura/desktop_screen_x11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_x11.cc b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
index e71ae6a6a82bfd9344ec8ccfb51eeb3882e94cfa..6ffd94a3c896909e26a399f93b380d9123bd01e7 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_x11.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_x11.cc
@@ -20,6 +20,7 @@
#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"
@@ -107,9 +108,9 @@ DesktopScreenX11::DesktopScreenX11()
RROutputChangeNotifyMask |
RRCrtcChangeNotifyMask);
- displays_ = BuildDisplaysFromXRandRInfo();
+ SetDisplaysInternal(BuildDisplaysFromXRandRInfo());
} else {
- displays_ = GetFallbackDisplayList();
+ SetDisplaysInternal(GetFallbackDisplayList());
}
}
@@ -366,11 +367,17 @@ std::vector<gfx::Display> DesktopScreenX11::BuildDisplaysFromXRandRInfo() {
void DesktopScreenX11::ConfigureTimerFired() {
std::vector<gfx::Display> old_displays = displays_;
- displays_ = BuildDisplaysFromXRandRInfo();
-
+ SetDisplaysInternal(BuildDisplaysFromXRandRInfo());
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() {

Powered by Google App Engine
This is Rietveld 408576698