A few more small changes to make GrAtlasTextBlob nearly self contained

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 "GrBatchFlushState.h"
@@ skipping 103 matching lines @@
         SkColor* vcolor = reinterpret_cast<SkColor*>(vertex + colorOffset);
         *vcolor = color;
     }
 
     if (regenTexCoords) {
         SkIPoint16* textureCoords = reinterpret_cast<SkIPoint16*>(vertex + texCoordOffset);
         textureCoords->set(u1, v0);
     }
 }
 
-typedef GrAtlasTextBlob Blob;
-typedef Blob::Run Run;
-typedef Run::SubRunInfo TextInfo;
-
 template <bool regenPos, bool regenCol, bool regenTexCoords, bool regenGlyphs>
 inline void GrAtlasTextBatch::regenBlob(Target* target, FlushInfo* flushInfo, Blob* blob, Run* run,
                                         TextInfo* info, SkGlyphCache** cache,
                                         SkTypeface** typeface, GrFontScaler** scaler,
                                         const SkDescriptor** desc, const GrGeometryProcessor* gp,
                                         int glyphCount, size_t vertexStride,
                                         GrColor color, SkScalar transX, SkScalar transY) const {
     static_assert(!regenGlyphs || regenTexCoords, "must regenTexCoords along regenGlyphs");
     GrBatchTextStrike* strike = nullptr;
     if (regenTexCoords) {
@@ skipping 413 matching lines @@
         return GrDistanceFieldA8TextGeoProc::Create(color,
                                                     viewMatrix,
                                                     texture,
                                                     params,
                                                     flags,
                                                     this->usesLocalCoords());
 #endif
     }
 
 }