src/gpu/GrAtlasTextContext.cpp - Issue 1267623004: Revert of Modifying TextBlobCacheTest to use SkRandomScalerContext

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.cpp

Issue 1267623004: Revert of Modifying TextBlobCacheTest to use SkRandomScalerContext (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: src/gpu/GrAtlasTextContext.cpp

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

index af27c791410bda3002c4273da9e40a54c1630f44..f5867ba9cb11e5d42b7a1e9115ff0eee549a05b9 100644

--- a/src/gpu/GrAtlasTextContext.cpp

+++ b/src/gpu/GrAtlasTextContext.cpp

@@ -1677,10 +1677,8 @@

}

glyph = blob->fGlyphs[glyphOffset];

SkASSERT(glyph);

- SkASSERT(id == glyph->fPackedID);

- // We want to be able to assert this but cannot for testing purposes.

- // once skbug:4143 has landed we can revist this assert

- //SkASSERT(glyph->fMaskFormat == this->maskFormat());

+ SkASSERT(id == glyph->fPackedID &&

+ glyph->fMaskFormat == this->maskFormat());

if (!fFontCache->hasGlyph(glyph) &&

!strike->addGlyphToAtlas(batchTarget, glyph, scaler, skGlyph,

« no previous file with comments | « src/fonts/SkRandomScalerContext.cpp ('k') | src/gpu/GrBatchAtlas.cpp » ('j') | no next file with comments »