diff options
Diffstat (limited to 'www/chromium/files/patch-ui_base_webui_web__ui__util.cc')
| -rw-r--r-- | www/chromium/files/patch-ui_base_webui_web__ui__util.cc | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc index 422ea71485b9..e0dc17d6ff3d 100644 --- a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,11 +1,20 @@ ---- ui/base/webui/web_ui_util.cc.orig 2020-03-16 18:40:15 UTC +--- ui/base/webui/web_ui_util.cc.orig 2020-11-13 06:37:05 UTC +++ ui/base/webui/web_ui_util.cc -@@ -236,7 +236,7 @@ std::string GetFontFamily() { +@@ -34,7 +34,7 @@ + #include "base/win/windows_version.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "ui/base/ui_base_features.h" + #endif + +@@ -232,7 +232,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - font_family = ui::ResourceBundle::GetSharedInstance().GetFont( - ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family; - #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (!features::IsUsingOzonePlatform()) { + font_family = ui::ResourceBundle::GetSharedInstance() + .GetFont(ui::ResourceBundle::BaseFont) |