commit 3912a4b1da5579e0508edf270f75982719f1c001
author Greg Daniel <egdaniel@google.com> Tue Jan 14 09:56:04 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 14 15:31:07 2020 +0000
tree 9a9b47e0d3c2b09c99f45ac4817edd2d1c12db73
parent 34386800a276158c95fb9fd72a3febd3f7513526

Update GrSurface/RenderTargetContexts to take and store GrSurfaceProxyViews.

Bug: skia:9556
Change-Id: Ie1aed1b16c237e9c9d1b582ac4ff02fdaaad238f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/263205
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/text/GrAtlasManager.cpp

diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index 0beb3d3..978ac45 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -83,20 +83,21 @@
   * Write the contents of the surface proxy to a PNG. Returns true if successful.
   * @param filename      Full path to desired file
   */
-static bool save_pixels(GrContext* context, GrSurfaceProxy* sProxy, GrColorType colorType,
+static bool save_pixels(GrContext* context, GrSurfaceProxyView view, GrColorType colorType,
                         const char* filename) {
-    if (!sProxy) {
+    if (!view.proxy()) {
         return false;
     }
 
     SkImageInfo ii =
-            SkImageInfo::Make(sProxy->dimensions(), kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+            SkImageInfo::Make(view.proxy()->dimensions(), kRGBA_8888_SkColorType,
+                              kPremul_SkAlphaType);
     SkBitmap bm;
     if (!bm.tryAllocPixels(ii)) {
         return false;
     }
 
-    auto sContext = GrSurfaceContext::Make(context, sk_ref_sp(sProxy), colorType,
+    auto sContext = GrSurfaceContext::Make(context, std::move(view), colorType,
                                            kUnknown_SkAlphaType, nullptr);
     if (!sContext || !sContext->asTextureProxy()) {
         return false;
@@ -141,7 +142,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, views[pageIdx].proxy(), ct, filename.c_str());
+                save_pixels(context, views[pageIdx], ct, filename.c_str());
             }
         }
     }