diff options
author | Hal Canary <halcanary@google.com> | 2018-06-14 16:17:29 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 16:17:38 +0000 |
commit | ab17347df32807cabd9f2a518d22c3bd420e482f (patch) | |
tree | 02cca902ae0fefc6a629340a7a95192e427353c9 /src/core/SkStringUtils.cpp | |
parent | b94097f315fb28c01f7b49d0e9f5b8ddf6a8fe5e (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/SkStringUtils.cpp')
-rw-r--r-- | src/core/SkStringUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |