commit 97a26d04e2a9324e7fc84c8a78d399e3484c9f50
author caryclark <caryclark@google.com> Fri Jul 17 13:20:48 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jul 17 13:20:48 2015 -0700
tree 544d066fbd29b6dd96a3edb46defb5b11cbcbed2
parent e49109f3b599afa1f9fe85d241aa68e842a7264e

make drawbitmaprect lighting lumafilter matrixconvolution srcmode gm portable

TBR=reed@google.com

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

gm/drawbitmaprect.cpp

diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 9db5ca7..d7b5a9b 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -163,7 +163,7 @@
         blackPaint.setColor(SK_ColorBLACK);
         blackPaint.setTextSize(titleHeight);
         blackPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&blackPaint);
+        sk_tool_utils::set_portable_typeface_always(&blackPaint);
         SkString title;
         title.printf("Bitmap size: %d x %d", gBmpSize, gBmpSize);
         canvas->drawText(title.c_str(), title.size(), 0,

gm/lighting.cpp

diff --git a/gm/lighting.cpp b/gm/lighting.cpp
index 6df5851..345e11e 100644
--- a/gm/lighting.cpp
+++ b/gm/lighting.cpp
@@ -33,7 +33,7 @@
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setColor(0xFFFFFFFF);
         paint.setTextSize(SkIntToScalar(96));
         const char* str = "e";

gm/lumafilter.cpp

diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp
index 66221f8..12c2f95 100644
--- a/gm/lumafilter.cpp
+++ b/gm/lumafilter.cpp
@@ -13,12 +13,12 @@
 static SkScalar kSize   = 80;
 static SkScalar kInset  = 10;
 static SkColor  kColor1 = SkColorSetARGB(0xff, 0xff, 0xff, 0);
-static SkColor  kColor2 = SkColorSetARGB(0xff, 0x80, 0xff, 0);
+static SkColor  kColor2 = SkColorSetARGB(0xff, 0x82, 0xff, 0);
 
 static void draw_label(SkCanvas* canvas, const char* label,
                        const SkPoint& offset) {
     SkPaint paint;
-    sk_tool_utils::set_portable_typeface(&paint);
+    sk_tool_utils::set_portable_typeface_always(&paint);
     size_t len = strlen(label);
 
     SkScalar width = paint.measureText(label, len);

gm/matrixconvolution.cpp

diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp
index b912f90..06684e4 100644
--- a/gm/matrixconvolution.cpp
+++ b/gm/matrixconvolution.cpp
@@ -30,7 +30,7 @@
         canvas.clear(0x00000000);
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setColor(0xFFFFFFFF);
         paint.setTextSize(SkIntToScalar(180));
         SkPoint pts[2] = { SkPoint::Make(0, 0),

gm/srcmode.cpp

diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp
index 85a3561..d089902 100644
--- a/gm/srcmode.cpp
+++ b/gm/srcmode.cpp
@@ -80,8 +80,8 @@
         canvas->translate(SkIntToScalar(20), SkIntToScalar(20));
 
         SkPaint paint;
-        sk_tool_utils::set_portable_typeface(&paint);
-        paint.setColor(0x80FF0000);
+        sk_tool_utils::set_portable_typeface_always(&paint);
+        paint.setColor(0x80F60000);
 
         const Proc procs[] = {
             draw_hair, draw_thick, draw_rect, draw_oval, draw_text