ui/views/linux_ui/linux_ui.h - Issue 1070433002: device scale factor detection: use gtk-xft-dpi consistently

Side by Side Diff: ui/views/linux_ui/linux_ui.h

Issue 1070433002: device scale factor detection: use gtk-xft-dpi consistently (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: device scale factor detection: always use X11 root window’s dpi Created 5 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | ui/views/widget/desktop_aura/desktop_screen_x11.cc » ('j') | ui/views/widget/desktop_aura/desktop_screen_x11.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef UI_VIEWS_LINUX_UI_LINUX_UI_H_	5 #ifndef UI_VIEWS_LINUX_UI_LINUX_UI_H_

6 #define UI_VIEWS_LINUX_UI_LINUX_UI_H_	6 #define UI_VIEWS_LINUX_UI_LINUX_UI_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/callback.h"	10 #include "base/callback.h"

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
146 virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() = 0;	146 virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() = 0;

147	147

148 // Notifies the window manager that start up has completed.	148 // Notifies the window manager that start up has completed.

149 // Normally Chromium opens a new window on startup and GTK does this	149 // Normally Chromium opens a new window on startup and GTK does this

150 // automatically. In case Chromium does not open a new window on startup,	150 // automatically. In case Chromium does not open a new window on startup,

151 // e.g. an existing browser window already exists, this should be called.	151 // e.g. an existing browser window already exists, this should be called.

152 virtual void NotifyWindowManagerStartupComplete() = 0;	152 virtual void NotifyWindowManagerStartupComplete() = 0;

153	153

154 // Updates the device scale factor so that the default font size can be	154 // Updates the device scale factor so that the default font size can be

155 // recalculated.	155 // recalculated.

156 virtual void UpdateDeviceScaleFactor(float device_scale_factor) = 0;	156 virtual void UpdateDeviceScaleFactor(float device_scale_factor) = 0;
	sadrul 2015/04/09 16:50:01 Given that LinuxUI is now responsible for getting Given that LinuxUI is now responsible for getting the DSF (which is used to set the DSF on the display), do we still need UpdateDeviceScaleFactor()? stapelberg 2015/04/09 18:11:29 Yes. If I try to call GetDeviceScaleFactor() direc Show quoted text On 2015/04/09 16:50:01, sadrul wrote: > Given that LinuxUI is now responsible for getting the DSF (which is used to set > the DSF on the display), do we still need UpdateDeviceScaleFactor()? Yes. If I try to call GetDeviceScaleFactor() directly in UpdateDefaultFont(), I get a segfault because the supported scale factors have not yet been initialized (we’ve had the same thing in another CL a while ago): #0 0x0000555556896e27 in ui::GetSupportedScaleFactor(float) () #1 0x0000555558fc3e37 in libgtk2ui::Gtk2UI::GetDeviceScaleFactor() const () #2 0x0000555558fc2ee8 in libgtk2ui::Gtk2UI::UpdateDefaultFont(_PangoFontDescription const*) () #3 0x0000555558fc09a5 in libgtk2ui::Gtk2UI::LoadGtkValues() () #4 0x0000555558fc073d in libgtk2ui::Gtk2UI::Initialize() () #5 0x00005555581b0860 in ChromeBrowserMainExtraPartsAura::ToolkitInitialized() () #6 0x0000555556283efa in ChromeBrowserMainParts::ToolkitInitialized() () #7 0x00005555586a30de in content::BrowserMainLoop::InitializeToolkit() () #8 0x00005555584b9760 in content::BrowserMainRunnerImpl::Initialize(content::MainFunctionParams const&) () #9 0x00005555584b947d in content::BrowserMain(content::MainFunctionParams const&) () #10 0x00005555565053d5 in content::ContentMainRunnerImpl::Run() () #11 0x0000555556504170 in content::ContentMain(content::ContentMainParams const&) () #12 0x0000555555ffe9f8 in ChromeMain () #13 0x00007ffff1523fe0 in __libc_start_main () at /lib64/libc.so.6 #14 0x0000555555ffe8af in _start ()
	157

	158 // Determines the device scale factor of the primary screen.

	159 virtual float GetDeviceScaleFactor() const = 0;

157 };	160 };

158	161

159 } // namespace views	162 } // namespace views

160	163

161 #endif // UI_VIEWS_LINUX_UI_LINUX_UI_H_	164 #endif // UI_VIEWS_LINUX_UI_LINUX_UI_H_

OLD	NEW