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

xfa/src/fxfa/src/app/xfa_ffwidget.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 "xfa/src/fxfa/src/common/xfa_common.h"
 #include "xfa_ffapp.h"
 #include "xfa_ffdoc.h"
 #include "xfa_ffdocview.h"
 #include "xfa_ffwidget.h"
 #include "xfa_ffpageview.h"
 #include "xfa_textlayout.h"
 CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView,
                              CXFA_WidgetAcc* pDataAcc)
@@ skipping 752 matching lines @@
   FX_FLOAT fWidth =
       XFA_UnitPx2Pt((FX_FLOAT)pDIBitmap->GetWidth(), (FX_FLOAT)iImageXDpi);
   FX_FLOAT fHeight =
       XFA_UnitPx2Pt((FX_FLOAT)pDIBitmap->GetHeight(), (FX_FLOAT)iImageYDpi);
   CFX_RectF rtFit;
   rtFit.Set(rtImage.left, rtImage.top, fWidth, fHeight);
   switch (iAspect) {
     case XFA_ATTRIBUTEENUM_Fit: {
       FX_FLOAT f1 = rtImage.height / rtFit.height;
       FX_FLOAT f2 = rtImage.width / rtFit.width;
-      f1 = FX_MIN(f1, f2);
+      f1 = std::min(f1, f2);
       rtFit.height = rtFit.height * f1;
       rtFit.width = rtFit.width * f1;
     } break;
     case XFA_ATTRIBUTEENUM_Actual:
       break;
     case XFA_ATTRIBUTEENUM_Height: {
       FX_FLOAT f1 = rtImage.height / rtFit.height;
       rtFit.height = rtImage.height;
       rtFit.width = f1 * rtFit.width;
     } break;
@@ skipping 319 matching lines @@
          iType == XFA_ELEMENT_Subform || iType == XFA_ELEMENT_ExclGroup;
 }
 static void XFA_BOX_GetPath_Arc(CXFA_Box box,
                                 CFX_RectF rtDraw,
                                 CFX_Path& fillPath,
                                 FX_DWORD dwFlags) {
   FX_FLOAT a, b;
   a = rtDraw.width / 2.0f;
   b = rtDraw.height / 2.0f;
   if (box.IsCircular() || (dwFlags & XFA_DRAWBOX_ForceRound) != 0) {
-    a = b = FX_MIN(a, b);
+    a = b = std::min(a, b);
   }
   CFX_PointF center = rtDraw.Center();
   rtDraw.left = center.x - a;
   rtDraw.top = center.y - b;
   rtDraw.width = a + a;
   rtDraw.height = b + b;
   FX_FLOAT startAngle = 0, sweepAngle = 360;
   FX_BOOL bStart = box.GetStartAngle(startAngle);
   FX_BOOL bEnd = box.GetSweepAngle(sweepAngle);
   if (!bStart && !bEnd) {
@@ skipping 518 matching lines @@
     XFA_BOX_GetPath_Arc(box, rtWidget, arcPath, dwFlags);
     XFA_BOX_StrokePath(edge, &arcPath, pGS, pMatrix);
     return;
   }
   pGS->SaveGraphState();
   pGS->SetLineWidth(fHalf);
   FX_FLOAT a, b;
   a = rtWidget.width / 2.0f;
   b = rtWidget.height / 2.0f;
   if (dwFlags & XFA_DRAWBOX_ForceRound) {
-    a = b = FX_MIN(a, b);
+    a = b = std::min(a, b);
   }
   CFX_PointF center = rtWidget.Center();
   rtWidget.left = center.x - a;
   rtWidget.top = center.y - b;
   rtWidget.width = a + a;
   rtWidget.height = b + b;
   FX_FLOAT startAngle = 0, sweepAngle = 360;
   startAngle = startAngle * FX_PI / 180.0f;
   sweepAngle = -sweepAngle * FX_PI / 180.0f;
   CFX_Path arcPath;
@@ skipping 279 matching lines @@
       iType != XFA_ELEMENT_Rectangle) {
     return;
   }
   CXFA_StrokeArray strokes;
   if (!(dwFlags & XFA_DRAWBOX_ForceRound) && iType != XFA_ELEMENT_Arc) {
     box.GetStrokes(strokes);
   }
   XFA_BOX_Fill(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
   XFA_BOX_Stroke(box, strokes, pGS, rtWidget, pMatrix, dwFlags);
 }