| Index: gm/shadertext2.cpp
|
| diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp
|
| index cd996b303100fd0fb831ff13d3bc40e25efe7464..92a0138acd53661ae5229b8be981bf48c4edc3a8 100644
|
| --- a/gm/shadertext2.cpp
|
| +++ b/gm/shadertext2.cpp
|
| @@ -43,7 +43,7 @@
|
| class ShaderText2GM : public GM {
|
| public:
|
| ShaderText2GM() {
|
| - this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
|
| + this->setBGColor(0xFFDDDDDD);
|
| }
|
|
|
| protected:
|
| @@ -90,13 +90,13 @@
|
|
|
| SkPaint fillPaint;
|
| fillPaint.setAntiAlias(true);
|
| - sk_tool_utils::set_portable_typeface_always(&fillPaint);
|
| + sk_tool_utils::set_portable_typeface(&fillPaint);
|
| fillPaint.setTextSize(SkIntToScalar(kPointSize));
|
| fillPaint.setFilterQuality(kLow_SkFilterQuality);
|
|
|
| SkPaint outlinePaint;
|
| outlinePaint.setAntiAlias(true);
|
| - sk_tool_utils::set_portable_typeface_always(&outlinePaint);
|
| + sk_tool_utils::set_portable_typeface(&outlinePaint);
|
| outlinePaint.setTextSize(SkIntToScalar(kPointSize));
|
| outlinePaint.setStyle(SkPaint::kStroke_Style);
|
| outlinePaint.setStrokeWidth(0.f);
|
| @@ -112,7 +112,7 @@
|
| SkPaint labelPaint;
|
| labelPaint.setColor(0xff000000);
|
| labelPaint.setAntiAlias(true);
|
| - sk_tool_utils::set_portable_typeface_always(&labelPaint);
|
| + sk_tool_utils::set_portable_typeface(&labelPaint);
|
| labelPaint.setTextSize(12.f);
|
|
|
| canvas->translate(15.f, 15.f);
|
|
|