commit 116b33e8ab2173f59d0244836740b42c63b29130
author Brian Osman <brianosman@google.com> Wed Feb 05 13:34:09 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 06 15:43:22 2020 +0000
tree 48fec46486321ba8fdcda71586d5d6bd49f4c79e
parent febdedfa446298a38e4ebbf6c2315f114e09370f

Remove SkMaxScalar and SkMinScalar

Use std::max and std::min instead

Change-Id: Icf3796609e5cb511687fb50bd31229ae4b6b9b39
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/268841
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

samplecode/SampleThinAA.cpp

diff --git a/samplecode/SampleThinAA.cpp b/samplecode/SampleThinAA.cpp
index 92aa202..8067827 100644
--- a/samplecode/SampleThinAA.cpp
+++ b/samplecode/SampleThinAA.cpp
@@ -403,8 +403,8 @@
                 case 'u': fAngle = 0.f; return true;
                 case 'y': fAngle = 90.f; return true;
                 case ' ': fAngle = SkScalarMod(fAngle + 15.f, 360.f); return true;
-                case '-': fStrokeWidth = SkMaxScalar(0.1f, fStrokeWidth - 0.05f); return true;
-                case '=': fStrokeWidth = SkMinScalar(1.f, fStrokeWidth + 0.05f); return true;
+                case '-': fStrokeWidth = std::max(0.1f, fStrokeWidth - 0.05f); return true;
+                case '=': fStrokeWidth = std::min(1.f, fStrokeWidth + 0.05f); return true;
             }
             return false;
     }