Start objectifying GrAtlasTextBlob

src/gpu/batches/GrAtlasTextBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrAtlasTextBatch_DEFINED
 #define GrAtlasTextBatch_DEFINED
 
 #include "batches/GrVertexBatch.h"
 
 #include "GrAtlasTextContext.h"
 
 class GrAtlasTextBatch : public GrVertexBatch {
 public:
     DEFINE_BATCH_CLASS_ID
     static const size_t kLCDTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
 
     // position + local coord
     static const size_t kColorTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
     static const size_t kGrayTextVASize = sizeof(SkPoint) + sizeof(GrColor) + sizeof(SkIPoint16);
-    static const int kVerticesPerGlyph = 4;
+    static const int kVerticesPerGlyph = GrAtlasTextBlob::kVerticesPerGlyph;
     static const int kIndicesPerGlyph = 6;
 
     typedef GrAtlasTextContext::DistanceAdjustTable DistanceAdjustTable;
     typedef GrAtlasTextBlob Blob;
     typedef Blob::Run Run;
     typedef Run::SubRunInfo TextInfo;
     struct Geometry {
         Blob* fBlob;
         int fRun;
         int fSubRun;
@@ skipping 48 matching lines @@
     Geometry& geometry() { return fGeoData[0]; }
 
     void init() {
         const Geometry& geo = fGeoData[0];
         fBatch.fColor = geo.fColor;
         fBatch.fViewMatrix = geo.fBlob->fViewMatrix;
 
         // We don't yet position distance field text on the cpu, so we have to map the vertex bounds
         // into device space
         const Run& run = geo.fBlob->fRuns[geo.fRun];
-        if (run.fSubRunInfo[geo.fSubRun].fDrawAsDistanceFields) {
+        if (run.fSubRunInfo[geo.fSubRun].drawAsDistanceFields()) {
             SkRect bounds = run.fVertexBounds;
             fBatch.fViewMatrix.mapRect(&bounds);
             this->setBounds(bounds);
         } else {
             this->setBounds(run.fVertexBounds);
         }
     }
 
     const char* name() const override { return "TextBatch"; }
 
@@ skipping 117 matching lines @@
     GrBatchFontCache* fFontCache;
 
     // Distance field properties
     SkAutoTUnref<const DistanceAdjustTable> fDistanceAdjustTable;
     SkColor fFilteredColor;
 
     typedef GrVertexBatch INHERITED;
 };
 
 #endif