From 70039d8c96085001ac59ff28c4bde476c8fd30cf Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 28 Jul 2018 17:12:35 +1000 Subject: Remove SkFastMin32 SkFastMin32 has been the same as SkMin32 since commit 38bad32cf52 "fold SK_CPU_HAS_CONDITION_INSTR through as always defined" was submitted in July 2013 as per https://chromiumcodereview.appspot.com/21122005 TBR=hcm@google.com The only change to the public API is removing a redundant helper from SkTypes.h Bug: skia: Change-Id: Ic6f7c7dc5612e8b7b1be3923f572ffcc13555d75 Reviewed-on: https://skia-review.googlesource.com/144242 Commit-Queue: Leon Scroggins Reviewed-by: Leon Scroggins --- src/core/SkScalerContext.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/SkScalerContext.cpp') diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 3089ee9755..872d3a5cc9 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -515,8 +515,8 @@ void SkScalerContext::getImage(const SkGlyph& origGlyph) { fRec.getMatrixFrom2x2(&matrix); if (as_MFB(fMaskFilter)->filterMask(&dstM, srcM, matrix, nullptr)) { - int width = SkFastMin32(origGlyph.fWidth, dstM.fBounds.width()); - int height = SkFastMin32(origGlyph.fHeight, dstM.fBounds.height()); + int width = SkMin32(origGlyph.fWidth, dstM.fBounds.width()); + int height = SkMin32(origGlyph.fHeight, dstM.fBounds.height()); int dstRB = origGlyph.rowBytes(); int srcRB = dstM.fRowBytes; -- cgit v1.2.3