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/bitmapcopy.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/bitmapcopy.cpp')
| -rw-r--r-- | gm/bitmapcopy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index 32e91e3cec..e1268b72dd 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -48,7 +48,7 @@ public: SkBitmap fDst[NUM_CONFIGS]; BitmapCopyGM() { - this->setBGColor(0xFFDDDDDD); + this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); } protected: @@ -75,9 +75,9 @@ protected: src.copyTo(&fDst[i], gColorTypes[i]); } - canvas->clear(0xFFDDDDDD); + canvas->clear(sk_tool_utils::color_to_565(0xFFDDDDDD)); paint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface(&paint); + sk_tool_utils::set_portable_typeface_always(&paint); SkScalar width = SkIntToScalar(40); SkScalar height = SkIntToScalar(40); |