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/dcshader.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/dcshader.cpp')
-rw-r--r-- | gm/dcshader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index a456c0c24a..6cfd00e840 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -110,7 +110,7 @@ bool DCShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMat class DCShaderGM : public GM { public: DCShaderGM() { - this->setBGColor(sk_tool_utils::color_to_565(0xFFAABBCC)); + this->setBGColor(0xFFAABBCC); } ~DCShaderGM() override { @@ -210,7 +210,7 @@ protected: } virtual void setFont(SkPaint* paint) { - sk_tool_utils::set_portable_typeface_always(paint); + sk_tool_utils::set_portable_typeface(paint); } virtual const char* text() const { return "Hello, Skia!"; } |