AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make colorwheelnative displacement dropshadowimagefilter getposttextpath gm portable

Browse Source 
TBR=reed@google.com

Review URL: https://codereview.chromium.org/1237233004
This commit is contained in:
caryclark 2015-07-15 09:29:32 -07:00 committed by Commit bot
parent cae3ca65d2
commit 3aaa0db1c4
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gm/colorwheel.cpp
View File

@ -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);

7
gm/displacement.cpp
View File

@ -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() {

2
gm/dropshadowimagefilter.cpp
View File

@ -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();

2
gm/getpostextpath.cpp
View File

@ -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));