Revert of merge to m47 fix for not calling eviction when atlas evicts

src/gpu/GrResourceProvider.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrResourceProvider.h"
 
 #include "GrGpu.h"
@@ skipping 146 matching lines @@
     desc.fConfig = config;
 
     // We don't want to flush the context so we claim we're in the middle of flushing so as to
     // guarantee we do not recieve a texture with pending IO
     // TODO: Determine how to avoid having to do this. (http://skbug.com/4156)
     static const uint32_t kFlags = GrResourceProvider::kNoPendingIO_Flag;
     GrTexture* texture = this->createApproxTexture(desc, kFlags);
     if (!texture) {
         return nullptr;
     }
-    GrBatchAtlas* atlas = new GrBatchAtlas(texture, numPlotsX, numPlotsY);
-    atlas->registerEvictionCallback(func, data);
-    return atlas;
+    return new GrBatchAtlas(texture, numPlotsX, numPlotsY);
 }
 
 GrStencilAttachment* GrResourceProvider::attachStencilAttachment(GrRenderTarget* rt) {
     SkASSERT(rt);
     if (rt->renderTargetPriv().getStencilAttachment()) {
         return rt->renderTargetPriv().getStencilAttachment();
     }
 
     if (!rt->wasDestroyed() && rt->canAttemptStencilAttachment()) {
         GrUniqueKey sbKey;
@@ skipping 30 matching lines @@
                 // FBO. But iOS doesn't allow a stencil-only FBO. It reports unsupported
                 // FBO status.
                 this->gpu()->clearStencil(rt);
             }
         }
     }
     return rt->renderTargetPriv().getStencilAttachment();
 }