6 files changed, 11 insertions, 11 deletions
diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp
index 15c070cd4e..a743dbce70 100644
--- a/src/core/SkImageInfo.cpp
+++ b/src/core/SkImageInfo.cpp
@@ -67,7 +67,7 @@ size_t SkImageInfo::computeByteSize(size_t rowBytes) const {
     SkSafeMath safe;
     size_t bytes = safe.add(safe.mul(safe.addInt(fHeight, -1), rowBytes),
                             safe.mul(fWidth, this->bytesPerPixel()));
-    return safe ? bytes : SIZE_MAX;
+    return safe ? bytes : SK_MaxSizeT;
 }
 
 SkImageInfo SkImageInfo::MakeS32(int width, int height, SkAlphaType at) {
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index 2d2ddacbaf..58645dab8f 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -89,11 +89,11 @@ float SkScalarSinCos(float radians, float* cosValue) {
 size_t SkSafeMath::Add(size_t x, size_t y) {
     SkSafeMath tmp;
     size_t sum = tmp.add(x, y);
-    return tmp.ok() ? sum : SIZE_MAX;
+    return tmp.ok() ? sum : SK_MaxSizeT;
 }
 
 size_t SkSafeMath::Mul(size_t x, size_t y) {
     SkSafeMath tmp;
     size_t prod = tmp.mul(x, y);
-    return tmp.ok() ? prod : SIZE_MAX;
+    return tmp.ok() ? prod : SK_MaxSizeT;
 }
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index e016d23797..0e8ceb1947 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -197,7 +197,7 @@ void SkResourceCache::purgeAsNeeded(bool forcePurge) {
 
     if (fDiscardableFactory) {
         countLimit = SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT;
-        byteLimit = UINT32_MAX;  // no limit based on bytes
+        byteLimit = SK_MaxU32;  // no limit based on bytes
     } else {
         countLimit = SK_MaxS32; // no limit based on count
         byteLimit = fTotalByteLimit;
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index 23c85f993e..7820f1d5bf 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -181,18 +181,18 @@ const SkString::Rec SkString::gEmptyRec(0, 0);
 
 static uint32_t trim_size_t_to_u32(size_t value) {
     if (sizeof(size_t) > sizeof(uint32_t)) {
-        if (value > UINT32_MAX) {
-            value = UINT32_MAX;
+        if (value > SK_MaxU32) {
+            value = SK_MaxU32;
         }
     }
     return (uint32_t)value;
 }
 
 static size_t check_add32(size_t base, size_t extra) {
-    SkASSERT(base <= UINT32_MAX);
+    SkASSERT(base <= SK_MaxU32);
     if (sizeof(size_t) > sizeof(uint32_t)) {
-        if (base + extra > UINT32_MAX) {
-            extra = UINT32_MAX - base;
+        if (base + extra > SK_MaxU32) {
+            extra = SK_MaxU32 - base;
         }
     }
     return extra;
diff --git a/src/core/SkStringUtils.cpp b/src/core/SkStringUtils.cpp
index c4c1739b19..00d8c8787c 100644
--- a/src/core/SkStringUtils.cpp
+++ b/src/core/SkStringUtils.cpp
@@ -63,7 +63,7 @@ SkString SkStringFromUTF16(const uint16_t* src, size_t count) {
             const uint16_t* last = ptr;
             SkUnichar u = SkUTF16_NextUnichar(&ptr);
             size_t s = SkUTF8_FromUnichar(u);
-            if (n > UINT32_MAX - s) {
+            if (n > SK_MaxU32 - s) {
                 end = last;  // truncate input string
                 break;
             }
diff --git a/src/core/SkVertices.cpp b/src/core/SkVertices.cpp
index e8bf1b7d88..4aa56c8e43 100644
--- a/src/core/SkVertices.cpp
+++ b/src/core/SkVertices.cpp
@@ -45,7 +45,7 @@ struct SkVertices::Sizes {
                 numFanTris = vertexCount - 2;
                 // By forcing this to become indexed we are adding a constraint to the maximum
                 // number of vertices.
-                if (vertexCount > (UINT16_MAX + 1)) {
+                if (vertexCount > (SK_MaxU16 + 1)) {
                     sk_bzero(this, sizeof(*this));
                     return;
                 }