diff options
| author |  caryclark <caryclark@google.com> | 2015-07-17 13:20:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-17 13:20:48 -0700 |
| commit | 97a26d04e2a9324e7fc84c8a78d399e3484c9f50 (patch) | |
| tree | 544d066fbd29b6dd96a3edb46defb5b11cbcbed2 | |
| parent | e49109f3b599afa1f9fe85d241aa68e842a7264e (diff) | |
make drawbitmaprect lighting lumafilter matrixconvolution srcmode gm portable
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1240843005
| -rw-r--r-- | gm/drawbitmaprect.cpp | 2 | ||||
| -rw-r--r-- | gm/lighting.cpp | 2 | ||||
| -rw-r--r-- | gm/lumafilter.cpp | 4 | ||||
| -rw-r--r-- | gm/matrixconvolution.cpp | 2 | ||||
| -rw-r--r-- | gm/srcmode.cpp | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 9db5ca71da..d7b5a9b236 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -163,7 +163,7 @@ protected: 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, diff --git a/gm/lighting.cpp b/gm/lighting.cpp index 6df58516b2..345e11e5a9 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -33,7 +33,7 @@ protected: 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"; diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index 66221f8303..12c2f95ef5 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); diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index b912f90cfe..06684e40d0 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -30,7 +30,7 @@ protected: 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), diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index 85a3561de2..d089902b70 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -80,8 +80,8 @@ protected: 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 |