include/gpu/GrFontScaler.h - Issue 636183005: Fix color emoji.

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: include/gpu/GrFontScaler.h

Issue 636183005: Fix color emoji. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix even dumber bug introduced by previous fix Created 6 years, 2 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: include/gpu/GrFontScaler.h

diff --git a/include/gpu/GrFontScaler.h b/include/gpu/GrFontScaler.h

index 037603813561bd59f2997235e4f6383422b61825..4eb4f396af4f6ca4cb2ada05234407fb62264396 100644

--- a/include/gpu/GrFontScaler.h

+++ b/include/gpu/GrFontScaler.h

@@ -67,6 +67,7 @@ public:

const GrFontDescKey* getKey();

GrMaskFormat getMaskFormat();

robertphillips 2014/10/09 16:14:53 Can this be const ?

jvanverth1 2014/10/09 17:34:35 Done.

+ GrMaskFormat getPackedGlyphMaskFormat(GrGlyph::PackedID);

bool getPackedGlyphBounds(GrGlyph::PackedID, SkIRect* bounds);

bool getPackedGlyphImage(GrGlyph::PackedID, int width, int height,

int rowBytes, void* image);

« no previous file with comments | « no previous file | include/gpu/GrGlyph.h » ('j') | src/gpu/GrBitmapTextContext.cpp » ('J')