make fontscalar gammatext lcdtext typeface verttext2 gm portable
Pass generic font names to tool util function to generate
platform specific fonts and gm test output by unique name.
R=bungeman@google.com
Review URL: https://codereview.chromium.org/1256903002
diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h
index 2bef19d..59ae66a 100644
--- a/tools/sk_tool_utils.h
+++ b/tools/sk_tool_utils.h
@@ -24,26 +24,73 @@
namespace sk_tool_utils {
const char* colortype_name(SkColorType);
+
+ /**
+ * Map opaque colors from 8888 to 565.
+ */
SkColor color_to_565(SkColor color);
+
+ /**
+ * Return a color emoji typeface if available.
+ */
void emoji_typeface(SkAutoTUnref<SkTypeface>* );
+
+ /**
+ * If the platform supports color emoji, return sample text the emoji can render.
+ */
const char* emoji_sample_text();
+
+ /**
+ * If the platform supports color emoji, return the type (i.e. "CBDT", "SBIX", "").
+ */
const char* platform_os_emoji();
+
+ /**
+ * Return the platform name with the version number ("Mac10.9", "Win8", etc.) if available.
+ */
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);
/**
+ * Map serif, san-serif, and monospace to the platform-specific font name.
+ */
+ const char* platform_font_name(const char* name);
+
+ /**
* Sets the paint to use a platform-independent text renderer if FLAGS_portableFonts is set.
* FIXME: will become obsolete as GMs migrate to set portable typeface always.
*/
void set_portable_typeface(SkPaint* paint, const char* name = NULL,
SkTypeface::Style style = SkTypeface::kNormal);
+
+ /**
+ * Sets the paint to use a platform-independent text renderer
+ */
void set_portable_typeface_always(SkPaint* paint, const char* name = NULL,
SkTypeface::Style style = SkTypeface::kNormal);
+
+ /**
+ * Returns a platform-independent text renderer if FLAGS_portableFonts is set.
+ * FIXME: will become obsolete as GMs migrate to set portable typeface always.
+ */
SkTypeface* create_portable_typeface(const char* name, SkTypeface::Style style);
+
+ /**
+ * Returns a platform-independent text renderer.
+ */
SkTypeface* create_portable_typeface_always(const char* name, SkTypeface::Style style);
+
/** Call to clean up portable font references. */
void release_portable_typefaces();
- void report_used_chars();
/**
* Call canvas->writePixels() by using the pixels from bitmap, but with an info that claims
@@ -53,7 +100,6 @@
// private to sk_tool_utils
SkTypeface* create_font(const char* name, SkTypeface::Style );
- SkTypeface* resource_font(const char* name, SkTypeface::Style );
/** Returns a newly created CheckerboardShader. */
SkShader* create_checkerboard_shader(SkColor c1, SkColor c2, int size);