GrAtlas cleanup: Split out GrPlot and GrAtlas

include/gpu/GrGlyph.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGlyph_DEFINED
 #define GrGlyph_DEFINED
 
 #include "GrRect.h"
 #include "SkPath.h"
 
-class GrAtlas;
+class GrPlot;
 
 /*  Need this to be quad-state:
     - complete w/ image
     - just metrics
     - failed to get image, but has metrics
     - failed to get metrics
  */
 struct GrGlyph {
     typedef uint32_t PackedID;
 
-    GrAtlas*    fAtlas;
+    GrPlot*     fPlot;
     SkPath*     fPath;
     PackedID    fPackedID;
     GrIRect16   fBounds;
     GrIPoint16  fAtlasLocation;
 
     void init(GrGlyph::PackedID packed, const SkIRect& bounds) {
-        fAtlas = NULL;
+        fPlot = NULL;
         fPath = NULL;
         fPackedID = packed;
         fBounds.set(bounds);
         fAtlasLocation.set(0, 0);
     }
 
     void free() {
         if (fPath) {
             delete fPath;
             fPath = NULL;
@@ skipping 26 matching lines @@
         return ((packed >> 16) & 3) << 14;
     }
 
     static inline uint16_t UnpackID(PackedID packed) {
         return (uint16_t)packed;
     }
 };
 
 
 #endif