make colorwheelnative displacement dropshadowimagefilter getposttextpath gm portable

TBR=reed@google.com

Review URL: https://codereview.chromium.org/1237233004

diff --git a/gm/colorwheel.cpp b/gm/colorwheel.cpp
index 6b9c149..f4542b3 100644 (file)
--- a/gm/colorwheel.cpp
+++ b/gm/colorwheel.cpp
@@ -39,10 +39,10 @@ DEF_SIMPLE_GM(colorwheel, canvas, 256, 256) {
 
 DEF_SIMPLE_GM(colorwheelnative, canvas, 128, 28) {
     SkPaint paint;
-    sk_tool_utils::set_portable_typeface(&paint, NULL, SkTypeface::kBold);
+    sk_tool_utils::set_portable_typeface_always(&paint, NULL, SkTypeface::kBold);
     paint.setTextSize(18.0f);
 
-    canvas->clear(SK_ColorLTGRAY);
+    canvas->clear(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
     paint.setColor(SK_ColorRED);
     canvas->drawText("R", 1, 8.0f, 20.0f, paint);
     paint.setColor(SK_ColorGREEN);

diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index 7b3d39c..129682d 100644 (file)
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -38,8 +38,8 @@ protected:
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
-        paint.setColor(0xFF884422);
+        sk_tool_utils::set_portable_typeface_always(&paint);
+        paint.setColor(sk_tool_utils::color_to_565(0xFF884422));
         paint.setTextSize(SkIntToScalar(96));
         const char* str = "g";
         canvas.drawText(str, strlen(str), SkIntToScalar(15), SkIntToScalar(55), paint);
@@ -48,7 +48,8 @@ protected:
     void make_checkerboard(SkBitmap* bitmap, int w, int h) {
         bitmap->allocN32Pixels(w, h);
         SkCanvas canvas(*bitmap);
-        sk_tool_utils::draw_checkerboard(&canvas, 0xFF244484, 0xFF804020, 8);
+        sk_tool_utils::draw_checkerboard(&canvas, sk_tool_utils::color_to_565(0xFF244484),
+            sk_tool_utils::color_to_565(0xFF804020), 8);
     }
 
     virtual SkISize onISize() {

diff --git a/gm/dropshadowimagefilter.cpp b/gm/dropshadowimagefilter.cpp
index e06264c..fd5f583 100644 (file)
--- a/gm/dropshadowimagefilter.cpp
+++ b/gm/dropshadowimagefilter.cpp
@@ -39,7 +39,7 @@ static void draw_text(SkCanvas* canvas, const SkRect& r, SkImageFilter* imf) {
     paint.setImageFilter(imf);
     paint.setColor(SK_ColorGREEN);
     paint.setAntiAlias(true);
-    sk_tool_utils::set_portable_typeface(&paint);
+    sk_tool_utils::set_portable_typeface_always(&paint);
     paint.setTextSize(r.height()/2);
     paint.setTextAlign(SkPaint::kCenter_Align);
     canvas->save();

diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index 2286602..bb641a0 100644 (file)
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -39,7 +39,7 @@ protected:
 
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setTextSize(SkIntToScalar(48));
 
         canvas->translate(SkIntToScalar(10), SkIntToScalar(64));