commit 9715b6c4504b8dc247eb037ee312bfa44a5f0d65
author Greg Daniel <egdaniel@google.com> Tue Dec 10 15:03:10 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Dec 10 20:29:27 2019 +0000
tree 6d5e28e7b58b8a40a8a151cf654be851f881ff95
parent ad994cd8941dfcb4c30ef7b58a40fb351c0e938f

Add GrSurfaceProxyView to the various draw atlas ops.

Bug: skia:9556
Change-Id: I9eb825ab241fd0d0d4e63408af270a89e872d1c9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/258802
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/text/GrAtlasManager.cpp

diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index 89b488d..ab47187 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -131,9 +131,9 @@
     static int gDumpCount = 0;
     for (int i = 0; i < kMaskFormatCount; ++i) {
         if (fAtlases[i]) {
-            const sk_sp<GrTextureProxy>* proxies = fAtlases[i]->getProxies();
+            const GrSurfaceProxyView* views = fAtlases[i]->getViews();
             for (uint32_t pageIdx = 0; pageIdx < fAtlases[i]->numActivePages(); ++pageIdx) {
-                SkASSERT(proxies[pageIdx]);
+                SkASSERT(views[pageIdx].proxy());
                 SkString filename;
 #ifdef SK_BUILD_FOR_ANDROID
                 filename.printf("/sdcard/fontcache_%d%d%d.png", gDumpCount, i, pageIdx);
@@ -141,7 +141,7 @@
                 filename.printf("fontcache_%d%d%d.png", gDumpCount, i, pageIdx);
 #endif
                 auto ct = mask_format_to_gr_color_type(AtlasIndexToMaskFormat(i));
-                save_pixels(context, proxies[pageIdx].get(), ct, filename.c_str());
+                save_pixels(context, views[pageIdx].proxy(), ct, filename.c_str());
             }
         }
     }