aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkString.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-14 16:17:29 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 16:17:38 +0000
commitab17347df32807cabd9f2a518d22c3bd420e482f (patch)
tree02cca902ae0fefc6a629340a7a95192e427353c9 /src/core/SkString.cpp
parentb94097f315fb28c01f7b49d0e9f5b8ddf6a8fe5e (diff)
Revert "Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines."
This reverts commit e1bc7de7c07686b28b00b850e44e0722189f3592. Reason for revert: chrome used it Original change's description: > 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> TBR=halcanary@google.com,bungeman@google.com,reed@google.com Change-Id: I1e2c440dcf9f59bf87c1fea113248cd5136f7519 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/134921 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core/SkString.cpp')
-rw-r--r--src/core/SkString.cpp10
1 files changed, 5 insertions, 5 deletions
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;