From b251b72d3d91fb7976f7984ae60793c87d0dae4c Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 13 Nov 2017 11:03:16 -0500 Subject: add platform_font_manager() This string replaces {major_}platform_os_name() and platform_extra_config() for the font-focused GMs using them. The GDI bots will report "GDI", the NativeFont bots their OS, and other bots "". Change-Id: I8f7bb1ffea3cc91601c98b4ccff7a3a234ac77d3 Reviewed-on: https://skia-review.googlesource.com/70500 Reviewed-by: Ben Wagner Commit-Queue: Mike Klein --- tools/sk_tool_utils.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'tools/sk_tool_utils.h') diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h index 2931243b9b..fe9daad255 100644 --- a/tools/sk_tool_utils.h +++ b/tools/sk_tool_utils.h @@ -52,19 +52,9 @@ namespace sk_tool_utils { const char* platform_os_emoji(); /** - * Return the platform name with the version number ("Mac10.9", "Win8", etc.) if available. + * Returns a string describing the platform font manager, if we're using one, otherwise "". */ - const char* platform_os_name(); - - /** - * Return the platform name without the version number ("Mac", "Win", etc.) if available. - */ - SkString major_platform_os_name(); - - /** - * Return the platform extra config (e.g. "GDI") if available. - */ - const char* platform_extra_config(const char* config); + const char* platform_font_manager(); /** * Map serif, san-serif, and monospace to the platform-specific font name. -- cgit v1.2.3