aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2018-06-13 15:01:39 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-14 14:10:47 +0000
commite1bc7de7c07686b28b00b850e44e0722189f3592 (patch)
tree827ddab1abd7f6df76287bdab1ed65ccf6801e36 /tests
parentb6b5b7a8082eddc6b198817ab0ea7d9c9f5dd4e4 (diff)
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/PDFGlyphsToUnicodeTest.cpp2
-rw-r--r--tests/ResourceCacheTest.cpp2
-rw-r--r--tests/StringTest.cpp2
-rw-r--r--tests/VerticesTest.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index 2aeedf0330..b90e11126d 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -14,7 +14,7 @@
#include "SkPDFMakeToUnicodeCmap.h"
#include "SkStream.h"
-static const int kMaximumGlyphCount = SK_MaxU16 + 1;
+static const int kMaximumGlyphCount = UINT16_MAX + 1;
static bool stream_equals(const SkDynamicMemoryWStream& stream, size_t offset,
const char* buffer, size_t len) {
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index b6ccd515c2..113945b414 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -1094,7 +1094,7 @@ static void test_timestamp_wrap(skiatest::Reporter* reporter) {
GrGpu* gpu = context->contextPriv().getGpu();
// Pick a random number of resources to add before the timestamp will wrap.
- cache->changeTimestamp(SK_MaxU32 - random.nextULessThan(kCount + 1));
+ cache->changeTimestamp(UINT32_MAX - random.nextULessThan(kCount + 1));
static const int kNumToPurge = kCount - kBudgetCnt;
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index f8c319e9be..503dbb8158 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -300,7 +300,7 @@ DEF_TEST(String_Threaded, r) {
// let us create a string with a requested length longer than we can manage.
DEF_TEST(String_huge, r) {
// start testing slightly below max 32
- size_t size = SK_MaxU32 - 16;
+ size_t size = UINT32_MAX - 16;
// See where we crash, and manually check that its at the right point.
//
// To test, change the false to true
diff --git a/tests/VerticesTest.cpp b/tests/VerticesTest.cpp
index 59d06472ac..b38a9de8ba 100644
--- a/tests/VerticesTest.cpp
+++ b/tests/VerticesTest.cpp
@@ -91,13 +91,13 @@ DEF_TEST(Vertices, reporter) {
{
// This has the maximum number of vertices to be rewritten as indexed triangles without
// overflowing a 16bit index.
- SkVertices::Builder builder(SkVertices::kTriangleFan_VertexMode, SK_MaxU16 + 1, 0,
+ SkVertices::Builder builder(SkVertices::kTriangleFan_VertexMode, UINT16_MAX + 1, 0,
SkVertices::kHasColors_BuilderFlag);
REPORTER_ASSERT(reporter, builder.isValid());
}
{
// This has too many to be rewritten.
- SkVertices::Builder builder(SkVertices::kTriangleFan_VertexMode, SK_MaxU16 + 2, 0,
+ SkVertices::Builder builder(SkVertices::kTriangleFan_VertexMode, UINT16_MAX + 2, 0,
SkVertices::kHasColors_BuilderFlag);
REPORTER_ASSERT(reporter, !builder.isValid());
}