diff options
author | caryclark <caryclark@google.com> | 2015-06-15 05:28:00 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-15 05:28:00 -0700 |
commit | 0bdb08b1ba8fbd18c4838f86a23f1ef4b3a3bfdf (patch) | |
tree | 39b221971fc0b5b1540d2c7fba9e6860fdada3b6 /gm/downsamplebitmap.cpp | |
parent | be7f768a357aefb39c42d24b81b24d647bb6ab70 (diff) |
Revert of make gm background colors 565 compatible (patchset #2 id:20001 of https://codereview.chromium.org/1176243006/)
Reason for revert:
breaks many bots with refcnt error
Original issue's description:
> make gm background colors 565 compatible
>
> Change a batch of GM tests to convert their background color
> so that it is representable in 8888 and 565.
>
> Enable portable text in those same tests to minimize platform
> differences.
>
> In a couple of bitmap tests, use portable typefaces instead of
> choosing 'Times' which may or may not be available on the platform.
>
> R=borenet@google.com
>
> Committed: https://skia.googlesource.com/skia/+/be7f768a357aefb39c42d24b81b24d647bb6ab70
TBR=borenet@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1184123002
Diffstat (limited to 'gm/downsamplebitmap.cpp')
-rw-r--r-- | gm/downsamplebitmap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index bb4736826f..8decc69f60 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -31,7 +31,7 @@ static void make_checker(SkBitmap* bm, int size, int numChecks) { } 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 @@ public: DownsampleBitmapGM(SkFilterQuality filterQuality) : fFilterQuality(filterQuality) { - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); + this->setBGColor(0xFFDDDDDD); fBitmapMade = false; } @@ -126,13 +126,13 @@ class DownsampleBitmapTextGM: public DownsampleBitmapGM { 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 @@ public: SkBitmap fBM; ShowMipLevels() { - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); + this->setBGColor(0xFFDDDDDD); make_checker(&fBM, 512, 256); } |