Switch most min/max macros to std::min/max.

core/src/fxge/android/fpf_skiafont.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fx_fpf.h"
+
+#include <algorithm>
+
 #if _FX_OS_ == _FX_ANDROID_
 #include "fpf_skiafont.h"
 #include "fpf_skiafontmgr.h"
 #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em)
 CFPF_SkiaFont::CFPF_SkiaFont()
     : m_pFontMgr(NULL),
       m_pFontDes(NULL),
       m_Face(NULL),
       m_dwStyle(0),
       m_uCharset(0),
@@ skipping 81 matching lines @@
       return FALSE;
     }
     FXFT_BBox cbox;
     FXFT_Glyph_Get_CBox(glyph, FXFT_GLYPH_BBOX_PIXELS, &cbox);
     int32_t x_ppem = m_Face->size->metrics.x_ppem;
     int32_t y_ppem = m_Face->size->metrics.y_ppem;
     rtBBox.left = FPF_EM_ADJUST(x_ppem, cbox.xMin);
     rtBBox.right = FPF_EM_ADJUST(x_ppem, cbox.xMax);
     rtBBox.top = FPF_EM_ADJUST(y_ppem, cbox.yMax);
     rtBBox.bottom = FPF_EM_ADJUST(y_ppem, cbox.yMin);
-    rtBBox.top = FX_MIN(rtBBox.top, GetAscent());
-    rtBBox.bottom = FX_MAX(rtBBox.bottom, GetDescent());
+    rtBBox.top = std::min(rtBBox.top, GetAscent());
+    rtBBox.bottom = std::max(rtBBox.bottom, GetDescent());
     FXFT_Done_Glyph(glyph);
     return FXFT_Set_Pixel_Sizes(m_Face, 0, 64) == 0;
   }
   if (FXFT_Load_Glyph(
           m_Face, iGlyphIndex,
           FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH)) {
     return FALSE;
   }
   rtBBox.left = FPF_EM_ADJUST(FXFT_Get_Face_UnitsPerEM(m_Face),
                               FXFT_Get_Glyph_HoriBearingX(m_Face));
@@ skipping 80 matching lines @@
     return FALSE;
   }
   m_dwStyle = dwStyle;
   m_uCharset = uCharset;
   m_pFontMgr = pFontMgr;
   m_pFontDes = pFontDes;
   m_dwRefCount = 1;
   return TRUE;
 }
 #endif