diff options
| author |  caryclark <caryclark@google.com> | 2015-06-15 06:51:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-15 06:51:08 -0700 |
| commit | 65cdba6ba78aaec0c0a4596bb5941020c789482b (patch) | |
| tree | fb677f25a1ebf5bbb24620c3607d19fe6073aedb /gm/shadertext3.cpp | |
| parent | f53ce808e9ff942c0bbc3c968e3d9393461c20db (diff) | |
Revert of Revert of make gm background colors 565 compatible (patchset #1 id:1 of https://codereview.chromium.org/1184123002/)
Reason for revert:
underlying problem with portable refs deleted more than once fixed
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/0bdb08b1ba8fbd18c4838f86a23f1ef4b3a3bfdf
TBR=borenet@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1182403003
Diffstat (limited to 'gm/shadertext3.cpp')
| -rw-r--r-- | gm/shadertext3.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index 49cdced97e..47dd29e60c 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -48,7 +48,7 @@ static const int kPointSize = 300; class ShaderText3GM : public GM { public: ShaderText3GM() { - this->setBGColor(0xFFDDDDDD); + this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD)); } protected: @@ -73,7 +73,7 @@ protected: SkPaint outlinePaint; outlinePaint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface(&outlinePaint); + sk_tool_utils::set_portable_typeface_always(&outlinePaint); outlinePaint.setTextSize(SkIntToScalar(kPointSize)); outlinePaint.setStyle(SkPaint::kStroke_Style); outlinePaint.setStrokeWidth(0.f); @@ -107,7 +107,7 @@ protected: SkPaint fillPaint; fillPaint.setAntiAlias(true); - sk_tool_utils::set_portable_typeface(&fillPaint); + sk_tool_utils::set_portable_typeface_always(&fillPaint); fillPaint.setTextSize(SkIntToScalar(kPointSize)); fillPaint.setFilterQuality(kLow_SkFilterQuality); fillPaint.setShader(shader); |