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

core/src/fxcrt/xml_int.h

 // 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
 
 #ifndef CORE_SRC_FXCRT_XML_INT_H_
 #define CORE_SRC_FXCRT_XML_INT_H_
 
+#include <algorithm>
+
 #include "core/include/fxcrt/fx_stream.h"
 
 class CFX_UTF8Decoder;
 class CXML_Element;
 
 class CXML_DataBufAcc : public IFX_BufferRead {
  public:
   CXML_DataBufAcc(const uint8_t* pBuffer, size_t size)
       : m_pBuffer(pBuffer), m_dwSize(size), m_dwCurPos(0) {}
   ~CXML_DataBufAcc() override {}
@@ skipping 16 matching lines @@
   const uint8_t* GetBlockBuffer() override { return m_pBuffer; }
   size_t GetBlockSize() override { return m_dwSize; }
   FX_FILESIZE GetBlockOffset() override { return 0; }
 
  protected:
   const uint8_t* m_pBuffer;
   size_t m_dwSize;
   size_t m_dwCurPos;
 };
 
-#define FX_XMLDATASTREAM_BufferSize (32 * 1024)
 class CXML_DataStmAcc : public IFX_BufferRead {
  public:
-  CXML_DataStmAcc(IFX_FileRead* pFileRead)
+  explicit CXML_DataStmAcc(IFX_FileRead* pFileRead)
       : m_pFileRead(pFileRead), m_pBuffer(NULL), m_nStart(0), m_dwSize(0) {
     FXSYS_assert(m_pFileRead);
   }
   ~CXML_DataStmAcc() override { FX_Free(m_pBuffer); }
 
   void Release() override { delete this; }
   FX_BOOL IsEOF() override {
     return m_nStart + (FX_FILESIZE)m_dwSize >= m_pFileRead->GetSize();
   }
   FX_FILESIZE GetPosition() override {
     return m_nStart + (FX_FILESIZE)m_dwSize;
   }
   size_t ReadBlock(void* buffer, size_t size) override { return 0; }
   FX_BOOL ReadNextBlock(FX_BOOL bRestart = FALSE) override {
     if (bRestart) {
       m_nStart = 0;
     }
     FX_FILESIZE nLength = m_pFileRead->GetSize();
     m_nStart += (FX_FILESIZE)m_dwSize;
     if (m_nStart >= nLength) {
       return FALSE;
     }
-    m_dwSize = (size_t)FX_MIN(FX_XMLDATASTREAM_BufferSize, nLength - m_nStart);
+    static const FX_FILESIZE FX_XMLDATASTREAM_BufferSize = 32 * 1024;
+    m_dwSize = static_cast<size_t>(
+        std::min(FX_XMLDATASTREAM_BufferSize, nLength - m_nStart));
     if (!m_pBuffer) {
       m_pBuffer = FX_Alloc(uint8_t, m_dwSize);
     }
     return m_pFileRead->ReadBlock(m_pBuffer, m_nStart, m_dwSize);
   }
   const uint8_t* GetBlockBuffer() override { return (const uint8_t*)m_pBuffer; }
   size_t GetBlockSize() override { return m_dwSize; }
   FX_FILESIZE GetBlockOffset() override { return m_nStart; }
 
  protected:
@@ skipping 35 matching lines @@
                             const CFX_WideStringC& content,
                             CXML_Element* pElement);
   void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement);
 };
 
 void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName,
                                CFX_ByteStringC& bsSpace,
                                CFX_ByteStringC& bsName);
 
 #endif  // CORE_SRC_FXCRT_XML_INT_H_