Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: gm/colorwheel.cpp

Issue 1880653002: nullptr -> "sans-serif" fixes bold in gm/colorwheel (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools/dm_flags.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "Resources.h" 8 #include "Resources.h"
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkImage.h" 10 #include "SkImage.h"
(...skipping 22 matching lines...) Expand all
33 DEF_SIMPLE_GM(colorwheel, canvas, 256, 256) { 33 DEF_SIMPLE_GM(colorwheel, canvas, 256, 256) {
34 sk_tool_utils::draw_checkerboard(canvas); 34 sk_tool_utils::draw_checkerboard(canvas);
35 draw_image(canvas, "color_wheel.png", 0, 0); // top left 35 draw_image(canvas, "color_wheel.png", 0, 0); // top left
36 draw_image(canvas, "color_wheel.gif", 128, 0); // top right 36 draw_image(canvas, "color_wheel.gif", 128, 0); // top right
37 draw_image(canvas, "color_wheel.webp", 0, 128); // bottom left 37 draw_image(canvas, "color_wheel.webp", 0, 128); // bottom left
38 draw_image(canvas, "color_wheel.jpg", 128, 128); // bottom right 38 draw_image(canvas, "color_wheel.jpg", 128, 128); // bottom right
39 } 39 }
40 40
41 DEF_SIMPLE_GM(colorwheelnative, canvas, 128, 28) { 41 DEF_SIMPLE_GM(colorwheelnative, canvas, 128, 28) {
42 SkPaint paint; 42 SkPaint paint;
43 sk_tool_utils::set_portable_typeface(&paint, nullptr, SkTypeface::kBold); 43 sk_tool_utils::set_portable_typeface(&paint, "sans-serif", SkTypeface::kBold );
44 paint.setTextSize(18.0f); 44 paint.setTextSize(18.0f);
45 45
46 canvas->clear(sk_tool_utils::color_to_565(SK_ColorLTGRAY)); 46 canvas->clear(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
47 paint.setColor(SK_ColorRED); 47 paint.setColor(SK_ColorRED);
48 canvas->drawText("R", 1, 8.0f, 20.0f, paint); 48 canvas->drawText("R", 1, 8.0f, 20.0f, paint);
49 paint.setColor(SK_ColorGREEN); 49 paint.setColor(SK_ColorGREEN);
50 canvas->drawText("G", 1, 24.0f, 20.0f, paint); 50 canvas->drawText("G", 1, 24.0f, 20.0f, paint);
51 paint.setColor(SK_ColorBLUE); 51 paint.setColor(SK_ColorBLUE);
52 canvas->drawText("B", 1, 40.0f, 20.0f, paint); 52 canvas->drawText("B", 1, 40.0f, 20.0f, paint);
53 paint.setColor(SK_ColorCYAN); 53 paint.setColor(SK_ColorCYAN);
54 canvas->drawText("C", 1, 56.0f, 20.0f, paint); 54 canvas->drawText("C", 1, 56.0f, 20.0f, paint);
55 paint.setColor(SK_ColorMAGENTA); 55 paint.setColor(SK_ColorMAGENTA);
56 canvas->drawText("M", 1, 72.0f, 20.0f, paint); 56 canvas->drawText("M", 1, 72.0f, 20.0f, paint);
57 paint.setColor(SK_ColorYELLOW); 57 paint.setColor(SK_ColorYELLOW);
58 canvas->drawText("Y", 1, 88.0f, 20.0f, paint); 58 canvas->drawText("Y", 1, 88.0f, 20.0f, paint);
59 paint.setColor(SK_ColorBLACK); 59 paint.setColor(SK_ColorBLACK);
60 canvas->drawText("K", 1, 104.0f, 20.0f, paint); 60 canvas->drawText("K", 1, 104.0f, 20.0f, paint);
61 } 61 }
OLDNEW
« no previous file with comments | « no previous file | tools/dm_flags.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698