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