Rename GrAtlasMgr to GrAtlas (and other cleanup)

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"
@@ skipping 35 matching lines @@
     , fLayerPool(16) {      // TODO: may need to increase this later
 }
 
 GrLayerCache::~GrLayerCache() {
 }
 
 void GrLayerCache::init() {
     static const int kAtlasTextureWidth = 1024;
     static const int kAtlasTextureHeight = 1024;
 
-    SkASSERT(NULL == fAtlasMgr.get());
+    SkASSERT(NULL == fAtlas.get());
 
     // The layer cache only gets 1 plot
     SkISize textureSize = SkISize::Make(kAtlasTextureWidth, kAtlasTextureHeight);
-    fAtlasMgr.reset(SkNEW_ARGS(GrAtlasMgr, (fContext->getGpu(), kSkia8888_GrPixelConfig,
-                                            textureSize, 1, 1, false)));
+    fAtlas.reset(SkNEW_ARGS(GrAtlas, (fContext->getGpu(), kSkia8888_GrPixelConfig,
+                                      textureSize, 1, 1, false)));
 }
 
 void GrLayerCache::freeAll() {
     fLayerHash.deleteAll();
-    fAtlasMgr.free();
+    fAtlas.free();
 }
 
 GrCachedLayer* GrLayerCache::createLayer(const 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;
 }
@@ skipping 23 matching lines @@
 }
 
 void GrLayerCache::unlock(GrCachedLayer* layer) {
     if (NULL == layer || NULL == layer->getTexture()) {
         return;
     }
 
     fContext->unlockScratchTexture(layer->getTexture());
     layer->setTexture(NULL);
 }