AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for distancefield text uses override descriptor

Browse Source 
BUG=skia:4282

Review URL: https://codereview.chromium.org/1324953002
This commit is contained in:
joshualitt 2015-09-02 06:13:39 -07:00 committed by Commit bot
parent e5a38f0ad2
commit 9446930c3b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gpu/GrAtlasTextContext.cpp
View File

@ -1671,8 +1671,9 @@ private:
info.fBulkUseToken.reset(); info.fBulkUseToken.reset();
// We can reuse if we have a valid strike and our descriptors / typeface are the // We can reuse if we have a valid strike and our descriptors / typeface are the
// same // same. The override descriptor is only for the non distance field text within
const SkDescriptor* newDesc = run.fOverrideDescriptor ? // a run
const SkDescriptor* newDesc = (run.fOverrideDescriptor && !usesDistanceFields) ?
run.fOverrideDescriptor->getDesc() : run.fOverrideDescriptor->getDesc() :
run.fDescriptor.getDesc(); run.fDescriptor.getDesc();
if (!cache || !SkTypeface::Equal(typeface, run.fTypeface) || if (!cache || !SkTypeface::Equal(typeface, run.fTypeface) ||