commit 7e7b5c5d0781c0bb8a83cb66708523baa4787fa8
author joshualitt <joshualitt@chromium.org> Tue Jul 21 12:56:56 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 21 12:56:56 2015 -0700
tree 61d3b9978c402d85aae4e6a17ef8c5d162d4b586
parent cd1930d4f19297c4089d7cb278243e4815c5793d

adding assert to GrAtlasTextContext

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1241263003

src/gpu/GrAtlasTextBlob.cpp

diff --git a/src/gpu/GrAtlasTextBlob.cpp b/src/gpu/GrAtlasTextBlob.cpp
index d357145..3fb7ac9 100644
--- a/src/gpu/GrAtlasTextBlob.cpp
+++ b/src/gpu/GrAtlasTextBlob.cpp
@@ -57,7 +57,7 @@
             SkASSERT(!rRun.fTypeface.get());
         }
 
-        // TODO BOUNDS ARE ALL MESSED UP
+        // We offset bounds right before flush time so they will not be correct here
         //SkASSERT(lRun.fVertexBounds == rRun.fVertexBounds);
 
         SkASSERT(lRun.fDescriptor.getDesc());

src/gpu/GrAtlasTextContext.cpp

diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index 0e901ae..b95c446 100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -409,8 +409,7 @@
                                      blob, x, y, drawFilter, clipRect, rt, clip, grPaint);
         } else {
             // If we can reuse the blob, then make sure we update the blob's viewmatrix, and x/y
-            // offsets
-            // TODO bounds are wrong
+            // offsets.  Note, we offset the vertex bounds right before flushing
             cacheBlob->fViewMatrix = viewMatrix;
             cacheBlob->fX = x;
             cacheBlob->fY = y;
@@ -1675,6 +1674,7 @@
                         }
                         glyph = blob->fGlyphs[glyphOffset];
                         SkASSERT(glyph);
+                        SkASSERT(glyph->fMaskFormat == fMaskFormat);
 
                         if (!fFontCache->hasGlyph(glyph) &&
                             !strike->addGlyphToAtlas(batchTarget, glyph, scaler)) {