gm/linepaths.cpp - Issue 1225303010: make linepaths gm portable

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gm/linepaths.cpp

Issue 1225303010: make linepaths gm portable (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

Index: gm/linepaths.cpp

diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp

index 4fb66414feeb03cf59dffc595528a84a37fe9660..2f5c69236aec913baf2b92bb7ad41f2aeb7f0c6a 100644

--- a/gm/linepaths.cpp

+++ b/gm/linepaths.cpp

@@ -82,8 +82,7 @@ protected:

SkPaint titlePaint;

titlePaint.setColor(SK_ColorBLACK);

titlePaint.setAntiAlias(true);

- sk_tool_utils::set_portable_typeface(&titlePaint);

- titlePaint.setLCDRenderText(true);

+ sk_tool_utils::set_portable_typeface_always(&titlePaint);

titlePaint.setTextSize(15 * SK_Scalar1);

const char title[] = "Line Drawn Into Rectangle Clips With "

"Indicated Style, Fill and Linecaps, with stroke width 10";

@@ -112,7 +111,7 @@ protected:

canvas->translate(rect.width() + 40 * SK_Scalar1, 0);

}

- SkColor color = 0xff007000;

+ SkColor color = sk_tool_utils::color_to_565(0xff007000);

this->drawPath(path.fPath, canvas, color, rect,

gCaps[cap].fCap, gCaps[cap].fJoin, gStyles[style].fStyle,

gFills[fill].fFill, SK_Scalar1*10);

@@ -127,8 +126,7 @@ protected:

SkPaint labelPaint;

labelPaint.setColor(color);

labelPaint.setAntiAlias(true);

- sk_tool_utils::set_portable_typeface(&labelPaint);

- labelPaint.setLCDRenderText(true);

+ sk_tool_utils::set_portable_typeface_always(&labelPaint);

labelPaint.setTextSize(10 * SK_Scalar1);

canvas->drawText(gStyles[style].fName,

strlen(gStyles[style].fName),

@@ -226,8 +224,7 @@ protected: