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

src/gpu/GrResourceProvider.cpp

Index: src/gpu/GrResourceProvider.cpp
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index bd9cc9ac6b04d1845098b63f261c22b6c4e7919c..5fa4e4beacb4f2eac2715463d5d4de1f87b1560c 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -164,7 +164,9 @@
     if (!texture) {
         return nullptr;
     }
-    return new GrBatchAtlas(texture, numPlotsX, numPlotsY);
+    GrBatchAtlas* atlas = new GrBatchAtlas(texture, numPlotsX, numPlotsY);
+    atlas->registerEvictionCallback(func, data);
+    return atlas;
 }
 
 GrStencilAttachment* GrResourceProvider::attachStencilAttachment(GrRenderTarget* rt) {