diff options
author | 2015-06-15 05:28:00 -0700 | |
---|---|---|
committer | 2015-06-15 05:28:00 -0700 | |
commit | 0bdb08b1ba8fbd18c4838f86a23f1ef4b3a3bfdf (patch) | |
tree | 39b221971fc0b5b1540d2c7fba9e6860fdada3b6 /gm/shadertext2.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/shadertext2.cpp')
-rw-r--r-- | gm/shadertext2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index cd996b3031..92a0138acd 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -43,7 +43,7 @@ struct LabeledMatrix { class ShaderText2GM : public GM { public: ShaderText2GM() { - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); + this->setBGColor(0xFFDDDDDD); } protected: @@ -90,13 +90,13 @@ protected: SkPaint fillPaint; fillPaint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface_always(&fillPaint); + sk_tool_utils::set_portable_typeface(&fillPaint); fillPaint.setTextSize(SkIntToScalar(kPointSize)); fillPaint.setFilterQuality(kLow_SkFilterQuality); SkPaint outlinePaint; outlinePaint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface_always(&outlinePaint); + sk_tool_utils::set_portable_typeface(&outlinePaint); outlinePaint.setTextSize(SkIntToScalar(kPointSize)); outlinePaint.setStyle(SkPaint::kStroke_Style); outlinePaint.setStrokeWidth(0.f); @@ -112,7 +112,7 @@ protected: SkPaint labelPaint; labelPaint.setColor(0xff000000); labelPaint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface_always(&labelPaint); + sk_tool_utils::set_portable_typeface(&labelPaint); labelPaint.setTextSize(12.f); canvas->translate(15.f, 15.f); |