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

xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp

Index: xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 2610db95dc1b41b30a4bb1707c5dc7f5c99e0430..2e16c036ca9f182f21c2f9650354c4ef21f93b2f 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -20,6 +20,8 @@
  * limitations under the License.
  */
 
+#include <algorithm>
+
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
 #include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
@@ -876,8 +878,8 @@ void CBC_QRCoderEncoder::InterleaveWithECBytes(CBC_QRCoderBitVector* bits,
         GenerateECBytes(dataBytes, numEcBytesInBlosk, e);
     BC_EXCEPTION_CHECK_ReturnVoid(e);
     blocks.Add(new CBC_QRCoderBlockPair(dataBytes, ecBytes));
-    maxNumDataBytes = FX_MAX(maxNumDataBytes, dataBytes->Size());
-    maxNumEcBytes = FX_MAX(maxNumEcBytes, ecBytes->Size());
+    maxNumDataBytes = std::max(maxNumDataBytes, dataBytes->Size());
+    maxNumEcBytes = std::max(maxNumEcBytes, ecBytes->Size());
     dataBytesOffset += numDataBytesInBlock;
   }
   if (numDataBytes != dataBytesOffset) {