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

xfa/src/fgas/src/crt/fx_utils.cpp

Index: xfa/src/fgas/src/crt/fx_utils.cpp
diff --git a/xfa/src/fgas/src/crt/fx_utils.cpp b/xfa/src/fgas/src/crt/fx_utils.cpp
index 9d89e240f40582f4b43bd54d35eafddd1b878472..7cc4de702237c7997105c89cd87f8483e3c1645d 100644
--- a/xfa/src/fgas/src/crt/fx_utils.cpp
+++ b/xfa/src/fgas/src/crt/fx_utils.cpp
@@ -4,6 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include <algorithm>
+
 #include "xfa/src/fgas/include/fx_utl.h"
 #include "xfa/src/fgas/src/fgas_base.h"
 #include "fx_utils.h"
@@ -241,7 +243,8 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart,
   uint8_t* pSrcChunk = (uint8_t*)src.GetAt(iSrcStart);
   int32_t iDstChunkSize = m_iChunkSize - (iDstStart % m_iChunkSize);
   int32_t iSrcChunkSize = src.m_iChunkSize - (iSrcStart % src.m_iChunkSize);
-  int32_t iCopySize = FX_MIN(iSrcCount, FX_MIN(iSrcChunkSize, iDstChunkSize));
+  int32_t iCopySize =
+      std::min(iSrcCount, std::min(iSrcChunkSize, iDstChunkSize));
   int32_t iCopyBytes = iCopySize * m_iBlockSize;
   while (iSrcCount > 0) {
     FXSYS_assert(pDstChunk != NULL && pSrcChunk != NULL);
@@ -263,7 +266,7 @@ void CFX_BaseMassArrayImp::Append(int32_t iDstStart,
     } else {
       pDstChunk += iCopyBytes;
     }
-    iCopySize = FX_MIN(iSrcCount, FX_MIN(iSrcChunkSize, iDstChunkSize));
+    iCopySize = std::min(iSrcCount, std::min(iSrcChunkSize, iDstChunkSize));
     iCopyBytes = iCopySize * m_iBlockSize;
   }
 }