Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Unified Diff: src/gpu/batches/GrAtlasTextBatch.cpp

Issue 1513723002: Fix bug with GrAtlasTextContext color regen (Closed) Base URL: https://skia.googlesource.com/skia.git@cleanuptext4
Patch Set: nit Created 5 years 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
« no previous file with comments | « src/gpu/GrAtlasTextBlob.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/batches/GrAtlasTextBatch.cpp
diff --git a/src/gpu/batches/GrAtlasTextBatch.cpp b/src/gpu/batches/GrAtlasTextBatch.cpp
index 3f3a521794f00d9782778614ca5dcea9a46bb918..d7f59a95c1ea07c4c750c1ae98e4c9af0cd03f12 100644
--- a/src/gpu/batches/GrAtlasTextBatch.cpp
+++ b/src/gpu/batches/GrAtlasTextBatch.cpp
@@ -203,8 +203,8 @@ inline void GrAtlasTextBatch::regenBlob(Target* target, FlushInfo* flushInfo, Bl
flushInfo->fGlyphsToFlush++;
}
- // We my have changed the color so update it here
- run->fColor = color;
+ // We may have changed the color so update it here
+ info->setColor(color);
if (regenTexCoords) {
if (regenGlyphs) {
info->setStrike(strike);
@@ -378,7 +378,7 @@ void GrAtlasTextBatch::onPrepareDraws(Target* target) const {
bool regenerateTextureCoords = info.atlasGeneration() != currentAtlasGen ||
regenerateGlyphs;
bool regenerateColors = kARGB_GrMaskFormat != maskFormat &&
- run.fColor != args.fColor;
+ info.color() != args.fColor;
bool regeneratePositions = args.fTransX != 0.f || args.fTransY != 0.f;
int glyphCount = info.glyphCount();
« no previous file with comments | « src/gpu/GrAtlasTextBlob.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698