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

xfa/src/fgas/src/layout/fx_rtfbreak.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 <algorithm>
+
 #include "xfa/src/fgas/include/fx_lbk.h"
 #include "xfa/src/fgas/src/fgas_base.h"
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
 #include "xfa/src/fgas/src/layout/fx_rtfbreak.h"
 
 IFX_RTFBreak* IFX_RTFBreak::Create(FX_DWORD dwPolicies) {
   return new CFX_RTFBreak(dwPolicies);
 }
 CFX_RTFBreak::CFX_RTFBreak(FX_DWORD dwPolicies)
     : m_dwPolicies(dwPolicies),
@@ skipping 365 matching lines @@
     }
   }
   int32_t iRotation = m_iRotation;
   if (m_bVertical && (dwProps & 0x8000) != 0) {
     iRotation = (iRotation + 1) % 4;
   }
   FX_DWORD dwRet2 =
       (this->*g_FX_RTFBreak_lpfAppendChar[dwType >> FX_CHARTYPEBITS])(
           pCurChar, iRotation);
   m_dwCharType = dwType;
-  return FX_MAX(dwRet1, dwRet2);
+  return std::max(dwRet1, dwRet2);
 }
 FX_DWORD CFX_RTFBreak::AppendChar_CharCode(FX_WCHAR wch) {
   FXSYS_assert(m_pFont != NULL && m_pCurLine != NULL);
   FXSYS_assert(m_bCharCode);
   m_pCurLine->m_iMBCSChars++;
   CFX_RTFCharArray& tca = m_pCurLine->m_LineChars;
   CFX_RTFChar* pCurChar = tca.AddSpace();
   pCurChar->m_dwStatus = 0;
   pCurChar->m_wCharCode = wch;
   pCurChar->m_dwCharProps = 0;
@@ skipping 741 matching lines @@
   if (iCount < 1) {
     rect.width = 0;
     return;
   }
   CFX_RTFPiece* pBreakPiece;
   int32_t iLineHeight = 0, iMax;
   for (int32_t i = 0; i < iCount; i++) {
     pBreakPiece = rtfPieces.GetPtrAt(i);
     int32_t iFontHeight = FXSYS_round(pBreakPiece->m_iFontHeight *
                                       pBreakPiece->m_iVerticalScale / 100.0f);
-    iMax = FX_MAX(pBreakPiece->m_iFontSize, iFontHeight);
+    iMax = std::max(pBreakPiece->m_iFontSize, iFontHeight);
     if (i == 0) {
       iLineHeight = iMax;
     } else if (iLineHeight < iMax) {
       iLineHeight = iMax;
     }
   }
   rect.height = ((FX_FLOAT)iLineHeight) / 20.0f;
 }
 void CFX_RTFBreak::ClearBreakPieces() {
   CFX_RTFLine* pRTFLine = GetRTFLine(TRUE);
@@ skipping 269 matching lines @@
   FX_FLOAT fScale = fFontSize / 1000.0f;
   IFX_Font* pFont = pText->pFont;
   if (pFont == NULL) {
     bCharBBox = FALSE;
   }
   CFX_Rect bbox;
   bbox.Set(0, 0, 0, 0);
   if (bCharBBox) {
     bCharBBox = pFont->GetBBox(bbox);
   }
-  FX_FLOAT fLeft = FX_MAX(0, bbox.left * fScale);
+  FX_FLOAT fLeft = std::max(0.0f, bbox.left * fScale);
   FX_FLOAT fHeight = FXSYS_fabs(bbox.height * fScale);
   rtArray.RemoveAll();
   rtArray.SetSize(iLength);
   FX_DWORD dwStyles = pText->dwLayoutStyles;
   FX_BOOL bVertical = (dwStyles & FX_RTFLAYOUTSTYLE_VerticalLayout) != 0;
   FX_BOOL bSingleLine = (dwStyles & FX_RTFLAYOUTSTYLE_SingleLine) != 0;
   FX_BOOL bCombText = (dwStyles & FX_TXTLAYOUTSTYLE_CombText) != 0;
   FX_WCHAR wch, wLineBreakChar = pText->wLineBreakChar;
   int32_t iCharSize;
   FX_FLOAT fCharSize, fStart;
@@ skipping 44 matching lines @@
         if (bCombText) {
           fRTLeft = (rect.width - fCharWidth) / 2.0f;
         }
       }
       CFX_RectF rtBBoxF;
       if (bVertical) {
         rtBBoxF.top = rect.left + fRTLeft;
         rtBBoxF.left = rect.top + (rect.height - fHeight) / 2.0f;
         rtBBoxF.height = fCharWidth;
         rtBBoxF.width = fHeight;
-        rtBBoxF.left = FX_MAX(rtBBoxF.left, 0);
+        rtBBoxF.left = std::max(rtBBoxF.left, 0.0f);
       } else {
         rtBBoxF.left = rect.left + fRTLeft;
         rtBBoxF.top = rect.top + (rect.height - fHeight) / 2.0f;
         rtBBoxF.width = fCharWidth;
         rtBBoxF.height = fHeight;
-        rtBBoxF.top = FX_MAX(rtBBoxF.top, 0);
+        rtBBoxF.top = std::max(rtBBoxF.top, 0.0f);
       }
       rtArray.SetAt(i, rtBBoxF);
       continue;
     }
     rtArray.SetAt(i, rect);
   }
   return iLength;
 }