Remove unecessary GetGlyphIdMetrics call

src/gpu/batches/GrAtlasTextBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlasTextBatch.h"
 
 #include "GrBatchFontCache.h"
@@ skipping 150 matching lines @@
             strike = info->fStrike;
         }
     }
 
     bool brokenRun = false;
     for (int glyphIdx = 0; glyphIdx < glyphCount; glyphIdx++) {
         GrGlyph* glyph = nullptr;
         if (regenTexCoords) {
             size_t glyphOffset = glyphIdx + info->fGlyphStartIndex;
 
-            glyph = blob->fGlyphs[glyphOffset];
-            GrGlyph::PackedID id = glyph->fPackedID;
-            const SkGlyph& skGlyph = (*scaler)->grToSkGlyph(id);
             if (regenGlyphs) {
                 // Get the id from the old glyph, and use the new strike to lookup
                 // the glyph.
-                blob->fGlyphs[glyphOffset] = strike->getGlyph(skGlyph, id, this->maskFormat(),
-                                                              *scaler);
+                GrGlyph::PackedID id = blob->fGlyphs[glyphOffset]->fPackedID;
+                blob->fGlyphs[glyphOffset] = strike->getGlyph(id, this->maskFormat(), *scaler);
+                SkASSERT(id == blob->fGlyphs[glyphOffset]->fPackedID);
             }
             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(glyph && glyph->fMaskFormat == this->maskFormat());
 
             if (!fFontCache->hasGlyph(glyph) &&
-                !strike->addGlyphToAtlas(target, glyph, *scaler, skGlyph, this->maskFormat())) {
+                !strike->addGlyphToAtlas(target, glyph, *scaler, this->maskFormat())) {
                 this->flush(target, flushInfo);
                 target->initDraw(gp, this->pipeline());
                 brokenRun = glyphIdx > 0;
 
                 SkDEBUGCODE(bool success =) strike->addGlyphToAtlas(target,
                                                                     glyph,
                                                                     *scaler,
-                                                                    skGlyph,
                                                                     this->maskFormat());
                 SkASSERT(success);
             }
             fFontCache->addGlyphToBulkAndSetUseToken(&info->fBulkUseToken, glyph,
                                                      target->currentToken());
         }
 
         intptr_t vertex = reinterpret_cast<intptr_t>(blob->fVertices);
         vertex += info->fVertexStartIndex;
         vertex += vertexStride * glyphIdx * GrAtlasTextBatch::kVerticesPerGlyph;
@@ skipping 367 matching lines @@
         return GrDistanceFieldA8TextGeoProc::Create(color,
                                                     viewMatrix,
                                                     texture,
                                                     params,
                                                     flags,
                                                     this->usesLocalCoords());
 #endif
     }
 
 }