From 0bdb08b1ba8fbd18c4838f86a23f1ef4b3a3bfdf Mon Sep 17 00:00:00 2001 From: caryclark Date: Mon, 15 Jun 2015 05:28:00 -0700 Subject: 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 --- gm/internal_links.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gm/internal_links.cpp') diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp index e422868ebc..3ba3052c6a 100644 --- a/gm/internal_links.cpp +++ b/gm/internal_links.cpp @@ -20,7 +20,7 @@ namespace skiagm { class InternalLinksGM : public GM { public: InternalLinksGM() { - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); + this->setBGColor(0xFFDDDDDD); } protected: @@ -61,7 +61,7 @@ private: canvas->drawRect(rect, paint); paint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface_always(&paint); + sk_tool_utils::set_portable_typeface(&paint); paint.setTextSize(SkIntToScalar(25)); paint.setColor(SK_ColorBLACK); canvas->drawText(text, strlen(text), x, y, paint); -- cgit v1.2.3