Rename GrAtlasedLayer to GrCachedLayer (since not all cached layers are atlased)

src/gpu/GrLayerCache.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlas.h"
 #include "GrGpu.h"
 #include "GrLayerCache.h"
 
 /**
  *  PictureLayerKey just wraps a saveLayer's id in the picture for GrTHashTable.
  */
 class GrLayerCache::PictureLayerKey {
 public:
     PictureLayerKey(uint32_t pictureID, int layerID)
         : fPictureID(pictureID)
         , fLayerID(layerID) {
     }
 
     uint32_t pictureID() const { return fPictureID; }
     int layerID() const { return fLayerID; }
 
     uint32_t getHash() const { return (fPictureID << 16) | fLayerID; }
 
-    static bool LessThan(const GrAtlasedLayer& layer, const PictureLayerKey& key) {
+    static bool LessThan(const GrCachedLayer& layer, const PictureLayerKey& key) {
         if (layer.pictureID() == key.pictureID()) {
             return layer.layerID() < key.layerID();
         }
 
         return layer.pictureID() < key.pictureID();
     }
 
-    static bool Equals(const GrAtlasedLayer& layer, const PictureLayerKey& key) {
+    static bool Equals(const GrCachedLayer& layer, const PictureLayerKey& key) {
         return layer.pictureID() == key.pictureID() && layer.layerID() == key.layerID();
     }
 
 private:
     uint32_t fPictureID;
     int      fLayerID;
 };
 
 GrLayerCache::GrLayerCache(GrGpu* gpu)
     : fGpu(SkRef(gpu))
@@ skipping 13 matching lines @@
     SkISize textureSize = SkISize::Make(kAtlasTextureWidth, kAtlasTextureHeight);
     fAtlasMgr.reset(SkNEW_ARGS(GrAtlasMgr, (fGpu, kSkia8888_GrPixelConfig,
                                             textureSize, 1, 1)));
 }
 
 void GrLayerCache::freeAll() {
     fLayerHash.deleteAll();
     fAtlasMgr.free();
 }
 
-GrAtlasedLayer* GrLayerCache::createLayer(SkPicture* picture, int layerID) {
-    GrAtlasedLayer* layer = fLayerPool.alloc();
+GrCachedLayer* GrLayerCache::createLayer(SkPicture* picture, int layerID) {
+    GrCachedLayer* layer = fLayerPool.alloc();
 
     SkASSERT(picture->uniqueID() != SK_InvalidGenID);
     layer->init(picture->uniqueID(), layerID);
     fLayerHash.insert(PictureLayerKey(picture->uniqueID(), layerID), layer);
     return layer;
 }
 
 
-const GrAtlasedLayer* GrLayerCache::findLayerOrCreate(SkPicture* picture, int layerID) {
+GrCachedLayer* GrLayerCache::findLayerOrCreate(SkPicture* picture, int layerID) {
     SkASSERT(picture->uniqueID() != SK_InvalidGenID);
-    GrAtlasedLayer* layer = fLayerHash.find(PictureLayerKey(picture->uniqueID(), layerID));
+    GrCachedLayer* layer = fLayerHash.find(PictureLayerKey(picture->uniqueID(), layerID));
     if (NULL == layer) {
         layer = this->createLayer(picture, layerID);
     }
     return layer;
 }