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/bitmapfilters.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/bitmapfilters.cpp')
| -rw-r--r-- | gm/bitmapfilters.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp index 11f93c9868..22a297df92 100644 --- a/gm/bitmapfilters.cpp +++ b/gm/bitmapfilters.cpp @@ -53,7 +53,7 @@ static SkScalar draw_row(SkCanvas* canvas, const SkBitmap& bm) { const int scale = 32; paint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface_always(&paint); + sk_tool_utils::set_portable_typeface(&paint); const char* name = sk_tool_utils::colortype_name(bm.colorType()); canvas->drawText(name, strlen(name), x, SkIntToScalar(bm.height())*scale*5/8, paint); @@ -80,7 +80,7 @@ public: SkBitmap fBM8, fBM4444, fBM16, fBM32; FilterGM() { - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); + this->setBGColor(0xFFDDDDDD); } protected: |