aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/degeneratesegments.cpp
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2015-07-17 09:39:16 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-17 09:39:16 -0700
commitdfcb7abc4141826d286d4e51c03d0c94e89f9751 (patch)
tree53c532f3ee6ed972e7fe7a4afef9e32913fe303e /gm/degeneratesegments.cpp
parenta2a6fe86998035f9930f31a84bce508ada044910 (diff)
make arithmode bigtext colortype* degeneratesegments gm portable
TBR=reed@google.com Review URL: https://codereview.chromium.org/1235343004
Diffstat (limited to 'gm/degeneratesegments.cpp')
-rw-r--r--gm/degeneratesegments.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index e5ca18796a..4016e45a28 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -287,8 +287,7 @@ protected:
SkPaint titlePaint;
titlePaint.setColor(SK_ColorBLACK);
titlePaint.setAntiAlias(true);
- sk_tool_utils::set_portable_typeface(&titlePaint);
- titlePaint.setLCDRenderText(true);
+ sk_tool_utils::set_portable_typeface_always(&titlePaint);
titlePaint.setTextSize(15 * SK_Scalar1);
const char title[] = "Random Paths Drawn Into Rectangle Clips With "
"Indicated Style, Fill and Linecaps, "
@@ -317,7 +316,7 @@ protected:
canvas->translate(rect.width() + 4*SK_Scalar1, 0);
}
- SkColor color = 0xff007000;
+ SkColor color = sk_tool_utils::color_to_565(0xff007000);
StyleAndName style = gStyles[(rand.nextU() >> 16) % numStyles];
CapAndName cap = gCaps[(rand.nextU() >> 16) % numCaps];
FillAndName fill = gFills[(rand.nextU() >> 16) % numFills];
@@ -348,8 +347,7 @@ protected:
SkPaint labelPaint;
labelPaint.setColor(color);
labelPaint.setAntiAlias(true);
- sk_tool_utils::set_portable_typeface(&labelPaint);
- labelPaint.setLCDRenderText(true);
+ sk_tool_utils::set_portable_typeface_always(&labelPaint);
labelPaint.setTextSize(10 * SK_Scalar1);
canvas->drawText(style.fName,
strlen(style.fName),