Merge GrGpuObject and GrCacheable.

src/gpu/GrAtlas.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 GrAtlas_DEFINED
 #define GrAtlas_DEFINED
 
 
-#include "SkPoint.h"
 #include "GrTexture.h"
 #include "GrDrawTarget.h"
+#include "SkPoint.h"
+#include "SkTInternalLList.h"
 
 class GrGpu;
 class GrRectanizer;
 class GrAtlas;
 
 // The backing GrTexture for a set of GrAtlases is broken into a spatial grid of GrPlots. When
 // a GrAtlas needs space on the texture, it requests a GrPlot. Each GrAtlas can claim one
 // or more GrPlots. The GrPlots keep track of subimage placement via their GrRectanizer. Once a
 // GrPlot is "full" (i.e. there is no room for the new subimage according to the GrRectanizer), the
 // GrAtlas can request a new GrPlot via GrAtlas::addToAtlas().
@@ skipping 97 matching lines @@
     int            fNumPlotsY;
     bool           fBatchUploads;
 
     // allocated array of GrPlots
     GrPlot*       fPlotArray;
     // LRU list of GrPlots (MRU at head - LRU at tail)
     GrPlotList    fPlotList;
 };
 
 #endif