1 files changed, 4 insertions, 2 deletions
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index c47dbb28b1..50d068a09c 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -300,6 +300,7 @@ public:
     void unflatten(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const;
 
+#ifdef SK_SUPPORT_LEGACY_SAFESIZE64
     int64_t getSafeSize64(size_t rowBytes) const {
         if (0 == fHeight) {
             return 0;
@@ -314,6 +315,7 @@ public:
         }
         return sk_64_asS32(size);
     }
+#endif
 
     /**
      *  Returns the size (in bytes) of the image buffer that this info needs, given the specified
@@ -331,8 +333,8 @@ public:
     }
 
     bool validRowBytes(size_t rowBytes) const {
-        uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel());
-        return rowBytes >= rb;
+        uint64_t minRB = sk_64_mul(fWidth, this->bytesPerPixel());
+        return rowBytes >= minRB;
     }
 
     void reset() {