src/gpu/GrTextStrike.h - Issue 23120004: Change Atlas recycling to track current flush count and recycle if Atlas not used in current flush.

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/GrTextStrike.h

Issue 23120004: Change Atlas recycling to track current flush count and recycle if Atlas not used in current flush. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Disable font cache stats; clean up whitespace. Created 7 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:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/GrTextStrike.h

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

index e359e267cf9816877a1db4d52011a4dc5b59efeb..47f7fb97d26e31d8e8549baad539abf662087a70 100644

--- a/src/gpu/GrTextStrike.h

+++ b/src/gpu/GrTextStrike.h

@@ -16,6 +16,7 @@

#include "GrTHashCache.h"

#include "GrPoint.h"

#include "GrGlyph.h"

+#include "GrDrawTarget.h"

class GrAtlasMgr;

class GrFontCache;

@@ -37,7 +38,7 @@ public:

GrMaskFormat getMaskFormat() const { return fMaskFormat; }

inline GrGlyph* getGlyph(GrGlyph::PackedID, GrFontScaler*);

- bool getGlyphAtlas(GrGlyph*, GrFontScaler*);

+ bool getGlyphAtlas(GrGlyph*, GrFontScaler*, GrDrawTarget::FlushToken currentFlushToken);

// testing

int countGlyphs() const { return fCache.getArray().count(); }

« src/gpu/GrInOrderDrawBuffer.h ('K') | « src/gpu/GrTextContext.cpp ('k') | src/gpu/GrTextStrike.cpp » ('j') | no next file with comments »