src/gpu/GrAtlasTextContext.h - Issue 1310703003: Merge fix for 522846 to m46

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: src/gpu/GrAtlasTextContext.h

Issue 1310703003: Merge fix for 522846 to m46 (Closed) Base URL: https://skia.googlesource.com/skia.git@m46

Patch Set: Created 5 years, 4 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:

Index: src/gpu/GrAtlasTextContext.h

diff --git a/src/gpu/GrAtlasTextContext.h b/src/gpu/GrAtlasTextContext.h

index 7ebe42e0197c7d42e1b50e8047d072293b163af5..4eeb42c84fa6d0a3f37067acc3b0477654de708f 100644

--- a/src/gpu/GrAtlasTextContext.h

+++ b/src/gpu/GrAtlasTextContext.h

@@ -65,7 +65,8 @@ private:

GrColor color, GrFontScaler*, const SkIRect& clipRect, SkScalar textRatio,

const SkMatrix& viewMatrix);

inline void appendGlyphPath(GrAtlasTextBlob*, GrGlyph*, GrFontScaler*, const SkGlyph&,

- SkScalar x, SkScalar y);

+ SkScalar x, SkScalar y, SkScalar scale = 1.0f,

+ bool applyVM = false);

inline void appendGlyphCommon(GrAtlasTextBlob*, Run*, Run::SubRunInfo*,

const SkRect& positions, GrColor color,

size_t vertexStride, bool useVertexColor,

« no previous file with comments | « src/gpu/GrAtlasTextBlob.h ('k') | src/gpu/GrAtlasTextContext.cpp » ('j') | no next file with comments »