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>

Author: brianosman

RELEASE_NOTES.txt

@@ -7,6 +7,7 @@ This file includes a list of high level updates for each milestone release.
 Milestone 82
 
 <Insert new notes here- top is most recent.>
+  * Removed SkMax32 and SkMin32.
   * Removed SkMaxScalar and SkMinScalar.
 
   * SkColorSetA now warns if the result is unused.

bench/AlternatingColorPatternBench.cpp

@@ -42,7 +42,7 @@ static void makebm(SkBitmap* bm, int w, int h) {
     bm->eraseColor(SK_ColorTRANSPARENT);
 
     SkCanvas    canvas(*bm);
-    SkScalar    s = SkIntToScalar(SkMin32(w, h));
+    SkScalar    s = SkIntToScalar(std::min(w, h));
     static const SkPoint     kPts0[] = { { 0, 0 }, { s, s } };
     static const SkPoint     kPts1[] = { { s/2, 0 }, { s/2, s } };
     static const SkScalar    kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 };

bench/BitmapBench.cpp

@@ -110,7 +110,7 @@ class BitmapBench : public Benchmark {
         p.setAntiAlias(true);
         p.setColor(SK_ColorRED);
         canvas.drawCircle(SkIntToScalar(w)/2, SkIntToScalar(h)/2,
-                          SkIntToScalar(SkMin32(w, h))*3/8, p);
+                          SkIntToScalar(std::min(w, h))*3/8, p);
 
         SkRect r;
         r.setWH(SkIntToScalar(w), SkIntToScalar(h));

bench/BitmapRectBench.cpp

@@ -23,7 +23,7 @@ static void draw_into_bitmap(const SkBitmap& bm) {
     p.setAntiAlias(true);
     p.setColor(SK_ColorRED);
     canvas.drawCircle(SkIntToScalar(w)/2, SkIntToScalar(h)/2,
-                      SkIntToScalar(SkMin32(w, h))*3/8, p);
+                      SkIntToScalar(std::min(w, h))*3/8, p);
 
     SkRect r;
     r.setWH(SkIntToScalar(w), SkIntToScalar(h));

bench/ChartBench.cpp

@@ -115,7 +115,7 @@ class ChartBench : public Benchmark {
 
         SkScalar height = SkIntToScalar(fSize.fHeight);
         if (sizeChanged) {
-            int dataPointCount = SkMax32(fSize.fWidth / kPixelsPerTick + 1, 2);
+            int dataPointCount = std::max(fSize.fWidth / kPixelsPerTick + 1, 2);
 
             SkRandom random;
             for (int i = 0; i < kNumGraphs; ++i) {

bench/FontCacheBench.cpp

@@ -125,7 +125,7 @@ class FontCacheEfficiency : public Benchmark {
                     int glyphs = 0;
                     const uint16_t* array = gUniqueGlyphIDs;
                     while (*array != gUniqueGlyphIDs_Sentinel) {
-                        int count = SkMin32(count_glyphs(array), limit);
+                        int count = std::min(count_glyphs(array), limit);
                         collisions += count_collisions(array, count, gRec[i].fHasher, hashMask);
                         glyphs += count;
                         array += count + 1;    // skip the sentinel

bench/RepeatTileBench.cpp

@@ -22,7 +22,7 @@ static void draw_into_bitmap(const SkBitmap& bm) {
     p.setAntiAlias(true);
     p.setColor(SK_ColorRED);
     canvas.drawCircle(SkIntToScalar(w)/2, SkIntToScalar(h)/2,
-                      SkIntToScalar(SkMin32(w, h))*3/8, p);
+                      SkIntToScalar(std::min(w, h))*3/8, p);
 
     SkRect r;
     r.setWH(SkIntToScalar(w), SkIntToScalar(h));

gm/fontmgr.cpp

@@ -88,7 +88,7 @@ class FontMgrGM : public skiagm::GM {
         font.setSize(17);
 
         SkFontMgr* fm = fFM.get();
-        int count = SkMin32(fm->countFamilies(), MAX_FAMILIES);
+        int count = std::min(fm->countFamilies(), MAX_FAMILIES);
 
         for (int i = 0; i < count; ++i) {
             SkString familyName;
@@ -316,7 +316,7 @@ class FontMgrBoundsGM : public skiagm::GM {
         const SkColor boundsColors[2] = { SK_ColorRED, SK_ColorBLUE };
 
         SkFontMgr* fm = fFM.get();
-        int count = SkMin32(fm->countFamilies(), 32);
+        int count = std::min(fm->countFamilies(), 32);
 
         int index = 0;
         SkScalar x = 0, y = 0;

gm/modecolorfilters.cpp

@@ -133,7 +133,7 @@ class ModeColorFilterGM : public GM {
 
         SkPaint paint;
         int idx = 0;
-        const int kRectsPerRow = SkMax32(this->getISize().fWidth / kRectWidth, 1);
+        const int kRectsPerRow = std::max(this->getISize().fWidth / kRectWidth, 1);
         for (size_t cfm = 0; cfm < SK_ARRAY_COUNT(modes); ++cfm) {
             for (size_t cfc = 0; cfc < SK_ARRAY_COUNT(colors); ++cfc) {
                 paint.setColorFilter(SkColorFilters::Blend(colors[cfc], modes[cfm]));

gm/shadertext3.cpp

@@ -34,7 +34,7 @@ static void makebm(SkBitmap* bm, int w, int h) {
     bm->eraseColor(SK_ColorTRANSPARENT);
 
     SkCanvas    canvas(*bm);
-    SkScalar    s = SkIntToScalar(SkMin32(w, h));
+    SkScalar    s = SkIntToScalar(std::min(w, h));
     const SkPoint     kPts0[] = { { 0, 0 }, { s, s } };
     const SkPoint     kPts1[] = { { s/2, 0 }, { s/2, s } };
     const SkScalar    kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 };