commit 7f36405ea3eccc0954921159882b25435bdabe26
author Brian Osman <brianosman@google.com> Thu Feb 06 11:25:43 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 06 17:31:51 2020 +0000
tree 45a1c560ecbe753d5901927f94d543d45d532d51
parent 18b90bc6794f354417373c85821f805ac2c01cfd

Remove SkMin32/SkMax32

Use std::max and std::min instead

Change-Id: I7fd2626ea9ea8ea09c709ff962523ca3de2f8a16
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269136
Reviewed-by: Mike Klein <mtklein@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

tests/FontNamesTest.cpp

diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index 101d98e..7645c15 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -146,7 +146,7 @@
     static const SkFontTableTag nameTag = SkSetFourByteTag('n','a','m','e');
 
     sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());
-    int count = SkMin32(fm->countFamilies(), MAX_FAMILIES);
+    int count = std::min(fm->countFamilies(), MAX_FAMILIES);
     for (int i = 0; i < count; ++i) {
         sk_sp<SkFontStyleSet> set(fm->createStyleSet(i));
         for (int j = 0; j < set->count(); ++j) {