commit e1bc7de7c07686b28b00b850e44e0722189f3592
author Hal Canary <halcanary@google.com> Wed Jun 13 15:01:39 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 14 14:10:47 2018 +0000
tree 827ddab1abd7f6df76287bdab1ed65ccf6801e36
parent b6b5b7a8082eddc6b198817ab0ea7d9c9f5dd4e4

Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines.

sed 's/SK_MaxSizeT/SIZE_MAX/g'
sed 's/SK_MaxU32/UINT32_MAX/g'
sed 's/SK_MaxU16/UINT16_MAX/g'

SK_MinU32 and SK_MinU16 were unused

Change-Id: I6b6c824df47b05bde7e73b13a58e851a5f63fe0e
Reviewed-on: https://skia-review.googlesource.com/134607
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>

src/core/SkImageInfo.cpp

diff --git a/src/core/SkImageInfo.cpp b/src/core/SkImageInfo.cpp
index a743dbc..15c070c 100644
--- a/src/core/SkImageInfo.cpp
+++ b/src/core/SkImageInfo.cpp
@@ -67,7 +67,7 @@
     SkSafeMath safe;
     size_t bytes = safe.add(safe.mul(safe.addInt(fHeight, -1), rowBytes),
                             safe.mul(fWidth, this->bytesPerPixel()));
-    return safe ? bytes : SK_MaxSizeT;
+    return safe ? bytes : SIZE_MAX;
 }
 
 SkImageInfo SkImageInfo::MakeS32(int width, int height, SkAlphaType at) {

src/core/SkMath.cpp

diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index 58645da..2d2ddac 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -89,11 +89,11 @@
 size_t SkSafeMath::Add(size_t x, size_t y) {
     SkSafeMath tmp;
     size_t sum = tmp.add(x, y);
-    return tmp.ok() ? sum : SK_MaxSizeT;
+    return tmp.ok() ? sum : SIZE_MAX;
 }
 
 size_t SkSafeMath::Mul(size_t x, size_t y) {
     SkSafeMath tmp;
     size_t prod = tmp.mul(x, y);
-    return tmp.ok() ? prod : SK_MaxSizeT;
+    return tmp.ok() ? prod : SIZE_MAX;
 }

src/core/SkResourceCache.cpp

diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index 5928b48..ee9d2d8 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -195,7 +195,7 @@
 
     if (fDiscardableFactory) {
         countLimit = SK_DISCARDABLEMEMORY_SCALEDIMAGECACHE_COUNT_LIMIT;
-        byteLimit = SK_MaxU32;  // no limit based on bytes
+        byteLimit = UINT32_MAX;  // no limit based on bytes
     } else {
         countLimit = SK_MaxS32; // no limit based on count
         byteLimit = fTotalByteLimit;

src/core/SkString.cpp

diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index a6d9335..a9c1d82 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -178,18 +178,18 @@
 
 static uint32_t trim_size_t_to_u32(size_t value) {
     if (sizeof(size_t) > sizeof(uint32_t)) {
-        if (value > SK_MaxU32) {
-            value = SK_MaxU32;
+        if (value > UINT32_MAX) {
+            value = UINT32_MAX;
         }
     }
     return (uint32_t)value;
 }
 
 static size_t check_add32(size_t base, size_t extra) {
-    SkASSERT(base <= SK_MaxU32);
+    SkASSERT(base <= UINT32_MAX);
     if (sizeof(size_t) > sizeof(uint32_t)) {
-        if (base + extra > SK_MaxU32) {
-            extra = SK_MaxU32 - base;
+        if (base + extra > UINT32_MAX) {
+            extra = UINT32_MAX - base;
         }
     }
     return extra;

src/core/SkStringUtils.cpp

diff --git a/src/core/SkStringUtils.cpp b/src/core/SkStringUtils.cpp
index 00d8c87..c4c1739 100644
--- a/src/core/SkStringUtils.cpp
+++ b/src/core/SkStringUtils.cpp
@@ -63,7 +63,7 @@
             const uint16_t* last = ptr;
             SkUnichar u = SkUTF16_NextUnichar(&ptr);
             size_t s = SkUTF8_FromUnichar(u);
-            if (n > SK_MaxU32 - s) {
+            if (n > UINT32_MAX - s) {
                 end = last;  // truncate input string
                 break;
             }

src/core/SkVertices.cpp

diff --git a/src/core/SkVertices.cpp b/src/core/SkVertices.cpp
index e23d65f..c0f3eb2 100644
--- a/src/core/SkVertices.cpp
+++ b/src/core/SkVertices.cpp
@@ -43,7 +43,7 @@
                 numFanTris = vertexCount - 2;
                 // By forcing this to become indexed we are adding a constraint to the maximum
                 // number of vertices.
-                if (vertexCount > (SK_MaxU16 + 1)) {
+                if (vertexCount > (UINT16_MAX + 1)) {
                     sk_bzero(this, sizeof(*this));
                     return;
                 }