diff --git a/skia/include/core/SkImage.h b/skia/include/core/SkImage.h
index 23beb51856da72005e2f2509a1adcfc9de3a7586..deda381dca403b39211924ee7b6c6837c2877605 100644
--- a/skia/include/core/SkImage.h
+++ b/skia/include/core/SkImage.h
@@ -1124,6 +1124,9 @@ public:
     */
     sk_sp<SkImage> reinterpretColorSpace(sk_sp<SkColorSpace> newColorSpace) const;
 
+    virtual std::string name() {
+        return "SkImage_Base";
+    }
 private:
     SkImage(const SkImageInfo& info, uint32_t uniqueID);
     friend class SkImage_Base;
diff --git a/skia/include/core/SkRefCnt.h b/skia/include/core/SkRefCnt.h
index 5227323e3aa54747683c0837558f28f57cf5c079..3737f5da574f8bd7c1861911bc030935cc9a6c8c 100644
--- a/skia/include/core/SkRefCnt.h
+++ b/skia/include/core/SkRefCnt.h
@@ -79,14 +79,12 @@ public:
         }
     }
 
-private:
 
-#ifdef SK_DEBUG
     /** Return the reference count. Use only for debugging. */
     int32_t getRefCnt() const {
         return fRefCnt.load(std::memory_order_relaxed);
     }
-#endif
+private:
 
     /**
      *  Called when the ref count goes to 0.
diff --git a/skia/src/image/SkImage_Gpu.h b/skia/src/image/SkImage_Gpu.h
index 71f3b14f4a651e30bf5082b24ddae5e280905de3..6b873925047177080a87c773bda467a24149ae41 100644
--- a/skia/src/image/SkImage_Gpu.h
+++ b/skia/src/image/SkImage_Gpu.h
@@ -22,6 +22,10 @@ struct SkYUVAIndex;
 
 class SkImage_Gpu : public SkImage_GpuBase {
 public:
+    std::string name() override {
+        return "SkImage_Gpu";
+    }
+    
     SkImage_Gpu(sk_sp<GrContext>, uint32_t uniqueID, SkAlphaType, sk_sp<GrTextureProxy>,
                 sk_sp<SkColorSpace>);
     ~SkImage_Gpu() override;
diff --git a/skia/src/image/SkImage_GpuYUVA.h b/skia/src/image/SkImage_GpuYUVA.h
index 2ec46ebedf940e2033f1ebd11f415e2e4d76a427..bb2cf9b3e960ec1dcdb2d14a5d79e08ceb30711c 100644
--- a/skia/src/image/SkImage_GpuYUVA.h
+++ b/skia/src/image/SkImage_GpuYUVA.h
@@ -22,6 +22,10 @@ struct SkYUVASizeInfo;
 // proxy will be stored and used for any future rendering.
 class SkImage_GpuYUVA : public SkImage_GpuBase {
 public:
+    std::string name() override {
+        return "SkImage_GpuYUVA";
+    }
+    
     friend class GrYUVAImageTextureMaker;
 
     SkImage_GpuYUVA(sk_sp<GrContext>, int width, int height, uint32_t uniqueID, SkYUVColorSpace,
diff --git a/skia/src/image/SkImage_Lazy.h b/skia/src/image/SkImage_Lazy.h
index bf43c9e07a0401036af769a6f8bfb117c90a841f..eaa53b339b6427898d08679e74851ac591aa8dc8 100644
--- a/skia/src/image/SkImage_Lazy.h
+++ b/skia/src/image/SkImage_Lazy.h
@@ -19,6 +19,10 @@ class SharedGenerator;
 
 class SkImage_Lazy : public SkImage_Base {
 public:
+    std::string name() override {
+        return "SkImage_Lazy";
+    }
+    
     struct Validator {
         Validator(sk_sp<SharedGenerator>, const SkIRect* subset, const SkColorType* colorType,
                   sk_sp<SkColorSpace> colorSpace);
diff --git a/skia/src/image/SkImage_Raster.cpp b/skia/src/image/SkImage_Raster.cpp
index f109234cf729bde16ced17e2e0fab44ad6ebf701..3a8c0a943d5fd72a42b6640cc9b663433d1b9147 100644
--- a/skia/src/image/SkImage_Raster.cpp
+++ b/skia/src/image/SkImage_Raster.cpp
@@ -34,6 +34,10 @@ static bool is_not_subset(const SkBitmap& bm) {
 
 class SkImage_Raster : public SkImage_Base {
 public:
+    std::string name() override {
+        return "SkImage_Raster";
+    }
+    
     static bool ValidArgs(const SkImageInfo& info, size_t rowBytes, size_t* minSize) {
         const int maxDimension = SK_MaxS32 >> 2;