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

fpdfsdk/src/fxedit/fxet_edit.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 "fpdfsdk/include/fxedit/fxet_edit.h"
 
+#include <algorithm>
+
 #include "core/include/fpdfapi/fpdf_resource.h"
 
 #define FX_EDIT_UNDO_MAXITEM 10000
 
 CFX_Edit_Iterator::CFX_Edit_Iterator(CFX_Edit* pEdit,
                                      IPDF_VariableText_Iterator* pVTIterator)
     : m_pEdit(pEdit), m_pVTIterator(pVTIterator) {}
 
 CFX_Edit_Iterator::~CFX_Edit_Iterator() {}
 
@@ skipping 150 matching lines @@
       if (CFX_Edit_LineRect* pNewRect = m_NewLineRects.GetAt(i))
         m_RefreshRects.Add(pNewRect->m_rcLine);
   }
 }
 
 void CFX_Edit_Refresh::Analyse(int32_t nAlignment) {
   FX_BOOL bLineTopChanged = FALSE;
   CPDF_Rect rcResult;
   FX_FLOAT fWidthDiff;
 
-  int32_t szMax =
-      FX_EDIT_MAX(m_OldLineRects.GetSize(), m_NewLineRects.GetSize());
+  int32_t szMax = std::max(m_OldLineRects.GetSize(), m_NewLineRects.GetSize());
   int32_t i = 0;
 
   while (i < szMax) {
     CFX_Edit_LineRect* pOldRect = m_OldLineRects.GetAt(i);
     CFX_Edit_LineRect* pNewRect = m_NewLineRects.GetAt(i);
 
     if (pOldRect) {
       if (pNewRect) {
         if (bLineTopChanged) {
           rcResult = pOldRect->m_rcLine;
@@ skipping 1528 matching lines @@
         m_pNotify->IOnContentChange(rcContent);
         m_bNotifyFlag = FALSE;
       }
       m_rcOldContent = rcContent;
     }
   }
 }
 
 void CFX_Edit::SelectAll() {
   if (m_pVT->IsValid()) {
-    m_SelState = GetWholeWordRange();
+    m_SelState = CFX_Edit_Select(GetWholeWordRange());
     SetCaret(m_SelState.EndPos);
 
     ScrollToCaret();
     CPVT_WordRange wrVisible = GetVisibleWordRange();
     Refresh(RP_OPTIONAL, &wrVisible);
     SetCaretInfo();
   }
 }
 
 void CFX_Edit::SelectNone() {
@@ skipping 1280 matching lines @@
     if (m_bOprNotify && m_pOprNotify)
       m_pOprNotify->OnAddUndo(pEditUndoItem);
   }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem) {
   m_Undo.AddItem(pUndoItem);
   if (m_bOprNotify && m_pOprNotify)
     m_pOprNotify->OnAddUndo(pUndoItem);
 }