| Index: gm/downsamplebitmap.cpp
|
| diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp
|
| index bb4736826f0684e81f2b8c1064e3ed89337343e8..8decc69f6096022b3c1ad11514c3f97fa7e22381 100644
|
| --- a/gm/downsamplebitmap.cpp
|
| +++ b/gm/downsamplebitmap.cpp
|
| @@ -31,7 +31,7 @@
|
| }
|
|
|
| static void setTypeface(SkPaint* paint, const char name[], SkTypeface::Style style) {
|
| - sk_tool_utils::set_portable_typeface_always(paint, name, style);
|
| + sk_tool_utils::set_portable_typeface(paint, name, style);
|
| }
|
|
|
| class DownsampleBitmapGM : public skiagm::GM {
|
| @@ -44,7 +44,7 @@
|
| DownsampleBitmapGM(SkFilterQuality filterQuality)
|
| : fFilterQuality(filterQuality)
|
| {
|
| - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
|
| + this->setBGColor(0xFFDDDDDD);
|
| fBitmapMade = false;
|
| }
|
|
|
| @@ -126,13 +126,13 @@
|
| paint.setSubpixelText(true);
|
| paint.setTextSize(fTextSize);
|
|
|
| - setTypeface(&paint, "serif", SkTypeface::kNormal);
|
| + setTypeface(&paint, "Times", SkTypeface::kNormal);
|
| canvas.drawText("Hamburgefons", 12, fTextSize/2, 1.2f*fTextSize, paint);
|
| - setTypeface(&paint, "serif", SkTypeface::kBold);
|
| + setTypeface(&paint, "Times", SkTypeface::kBold);
|
| canvas.drawText("Hamburgefons", 12, fTextSize/2, 2.4f*fTextSize, paint);
|
| - setTypeface(&paint, "serif", SkTypeface::kItalic);
|
| + setTypeface(&paint, "Times", SkTypeface::kItalic);
|
| canvas.drawText("Hamburgefons", 12, fTextSize/2, 3.6f*fTextSize, paint);
|
| - setTypeface(&paint, "serif", SkTypeface::kBoldItalic);
|
| + setTypeface(&paint, "Times", SkTypeface::kBoldItalic);
|
| canvas.drawText("Hamburgefons", 12, fTextSize/2, 4.8f*fTextSize, paint);
|
| }
|
| private:
|
| @@ -202,7 +202,7 @@
|
| SkBitmap fBM;
|
|
|
| ShowMipLevels() {
|
| - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
|
| + this->setBGColor(0xFFDDDDDD);
|
| make_checker(&fBM, 512, 256);
|
| }
|
|
|
|
|