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

xfa/src/fdp/src/css/fde_csscache.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/foxitlib.h"
 #include "fde_csscache.h"
 _FDE_CSSCACHEITEM::_FDE_CSSCACHEITEM(IFDE_CSSStyleSheet* p)
     : pStylesheet(p), dwActivity(0) {
   FXSYS_assert(pStylesheet);
   pStylesheet->AddRef();
 }
 _FDE_CSSCACHEITEM::~_FDE_CSSCACHEITEM() {
   pStylesheet->Release();
 }
@@ skipping 10 matching lines @@
   }
   m_Stylesheets.clear();
   if (m_pFixedStore) {
     m_pFixedStore->Release();
   }
 }
 void CFDE_CSSStyleSheetCache::AddStyleSheet(const CFX_ByteStringC& szKey,
                                             IFDE_CSSStyleSheet* pStyleSheet) {
   FXSYS_assert(pStyleSheet != NULL);
   if (m_pFixedStore == NULL) {
-    m_pFixedStore = FX_CreateAllocator(
-        FX_ALLOCTYPE_Fixed, FX_MAX(10, m_iMaxItems), sizeof(FDE_CSSCACHEITEM));
+    m_pFixedStore =
+        FX_CreateAllocator(FX_ALLOCTYPE_Fixed, std::max(10, m_iMaxItems),
+                           sizeof(FDE_CSSCACHEITEM));
     FXSYS_assert(m_pFixedStore != NULL);
   }
   auto it = m_Stylesheets.find(szKey);
   if (it != m_Stylesheets.end()) {
     FDE_LPCSSCACHEITEM pItem = it->second;
     if (pItem->pStylesheet != pStyleSheet) {
       pItem->pStylesheet->Release();
       pItem->pStylesheet = pStyleSheet;
       pItem->pStylesheet->AddRef();
       pItem->dwActivity = 0;
@@ skipping 86 matching lines @@
 void CFDE_CSSAccelerator::OnEnterTag(IFDE_CSSTagProvider* pTag) {
   FDE_CSSTAGCACHE* pTop = GetTopElement();
   FDE_CSSTAGCACHE item(pTop, pTag);
   m_Stack.Push(item);
 }
 void CFDE_CSSAccelerator::OnLeaveTag(IFDE_CSSTagProvider* pTag) {
   FDE_CSSTAGCACHE* pItem = m_Stack.GetTopElement();
   FXSYS_assert(pItem && pItem->GetTag() == pTag);
   m_Stack.Pop();
 }