Remove SkTMin and SkTMax
Use std::min and std::max everywhere.
SkTPin still exists. We can't use std::clamp yet, and even when
we can, it has undefined behavior with NaN. SkTPin is written
to ensure that we return a value in the [lo, hi] range.
Change-Id: I506852a36e024ae405358d5078a872e2c77fa71e
Docs-Preview: https://skia.org/?cl=269357
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/269357
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/modules/skplaintexteditor/src/shape.cpp b/modules/skplaintexteditor/src/shape.cpp
index 9acba0d..d37350b 100644
--- a/modules/skplaintexteditor/src/shape.cpp
+++ b/modules/skplaintexteditor/src/shape.cpp
@@ -100,9 +100,9 @@
void RunHandler::runInfo(const SkShaper::RunHandler::RunInfo& info) {
SkFontMetrics metrics;
info.fFont.getMetrics(&metrics);
- fMaxRunAscent = SkTMin(fMaxRunAscent, metrics.fAscent);
- fMaxRunDescent = SkTMax(fMaxRunDescent, metrics.fDescent);
- fMaxRunLeading = SkTMax(fMaxRunLeading, metrics.fLeading);
+ fMaxRunAscent = std::min(fMaxRunAscent, metrics.fAscent);
+ fMaxRunDescent = std::max(fMaxRunDescent, metrics.fDescent);
+ fMaxRunLeading = std::max(fMaxRunLeading, metrics.fLeading);
}
void RunHandler::commitRunInfo() {
@@ -154,7 +154,7 @@
fClusters[i] -= fClusterOffset;
}
fCurrentPosition += info.fAdvance;
- fTextOffset = SkTMax(fTextOffset, info.utf8Range.end());
+ fTextOffset = std::max(fTextOffset, info.utf8Range.end());
}
void RunHandler::commitLine() {