Index: gm/filterbitmap.cpp |
diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp |
index 7d7c40ff50f3677ab33544d7e3c067388681e388..d7194c096d7f48569876b780d67b7730d29a2ede 100644 |
--- a/gm/filterbitmap.cpp |
+++ b/gm/filterbitmap.cpp |
@@ -14,7 +14,7 @@ |
#include "SkTypeface.h" |
static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) { |
- sk_tool_utils::set_portable_typeface(paint, name, style); |
+ sk_tool_utils::set_portable_typeface_always(paint, name, style); |
} |
static SkSize computeSize(const SkBitmap& bm, const SkMatrix& mat) { |
@@ -66,7 +66,7 @@ public: |
FilterBitmapGM() |
{ |
- this->setBGColor(0xFFDDDDDD); |
+ this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); |
} |
protected: |
@@ -124,13 +124,13 @@ class FilterBitmapTextGM: public FilterBitmapGM { |
paint.setSubpixelText(true); |
paint.setTextSize(fTextSize); |
- setTypeface(&paint, "Times", SkTypeface::kNormal); |
+ setTypeface(&paint, "serif", SkTypeface::kNormal); |
canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2f*fTextSize, paint); |
- setTypeface(&paint, "Times", SkTypeface::kBold); |
+ setTypeface(&paint, "serif", SkTypeface::kBold); |
canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4f*fTextSize, paint); |
- setTypeface(&paint, "Times", SkTypeface::kItalic); |
+ setTypeface(&paint, "serif", SkTypeface::kItalic); |
canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint); |
- setTypeface(&paint, "Times", SkTypeface::kBoldItalic); |
+ setTypeface(&paint, "serif", SkTypeface::kBoldItalic); |
canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint); |
} |
private: |