diff options
| author |  caryclark <caryclark@google.com> | 2015-06-15 05:09:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-15 05:09:59 -0700 |
| commit | be7f768a357aefb39c42d24b81b24d647bb6ab70 (patch) | |
| tree | a5897bcb5ce6dc995cf0cfea5e72a989cc2d16a1 /gm/bitmapfilters.cpp | |
| parent | b5b50a07abb454abaf6ab46db20c6db6f5ecf9f6 (diff) | |
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
Review URL: https://codereview.chromium.org/1176243006
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 22a297df92..11f93c9868 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(&paint); + sk_tool_utils::set_portable_typeface_always(&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(0xFFDDDDDD); + this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); } protected: |