More define cleanup.

xfa/fwl/core/fwl_widgetmgrimp.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 "xfa/fwl/core/fwl_widgetmgrimp.h"
 
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/ifwl_adapternative.h"
 #include "xfa/fwl/core/ifwl_adapterwidgetmgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_form.h"
 
+namespace {
+
+const int kNeedRepaintHitPoints = 12;
+const int kNeedRepaintHitPiece = 3;
+
+struct FWL_NEEDREPAINTHITDATA {
+  CFX_PointF hitPoint;
+  FX_BOOL bNotNeedRepaint;

[Tom Sepez, 2016/05/02 21:45:39]

can these be bools?

[dsinclair, 2016/05/03 13:58:16]

Done.

+  FX_BOOL bNotContainByDirty;
+};
+
+}  // namespace
+
 FX_BOOL FWL_UseOffscreen(IFWL_Widget* pWidget) {
 #if (_FX_OS_ == _FX_MACOSX_)
   return FALSE;
 #else
   return pWidget->GetStyles() & FWL_WGTSTYLE_Offscreen;
 #endif
 }
 IFWL_WidgetMgr* FWL_GetWidgetMgr() {
   IFWL_App* pApp = FWL_GetApp();
   if (!pApp)
@@ skipping 828 matching lines @@
     pGraphics->Transfer(pItem->pOffscreen, rtClip.left, rtClip.top, rtClip,
                         pMatrix);
 #ifdef _WIN32
     pItem->pOffscreen->ClearClip();
 #endif
   }
   CFWL_WidgetMgrItem* pItem = m_pWidgetMgr->GetWidgetMgrItem(pWidget);
   pItem->iRedrawCounter = 0;
 }
 
-#define FWL_NEEDREPAINTHIT_Point 12
-#define FWL_NEEDREPAINTHIT_Piece 3
-struct FWL_NEEDREPAINTHITDATA {
-  CFX_PointF hitPoint;
-  FX_BOOL bNotNeedRepaint;
-  FX_BOOL bNotContainByDirty;
-};
-
 FX_BOOL CFWL_WidgetMgrDelegate::IsNeedRepaint(IFWL_Widget* pWidget,
                                               CFX_Matrix* pMatrix,
                                               const CFX_RectF& rtDirty) {
   CFWL_WidgetMgrItem* pItem = m_pWidgetMgr->GetWidgetMgrItem(pWidget);
   if (pItem && pItem->iRedrawCounter > 0) {
     pItem->iRedrawCounter = 0;
     return TRUE;
   }
   CFX_RectF rtWidget;
   pWidget->GetWidgetRect(rtWidget);
@@ skipping 17 matching lines @@
         return TRUE;
       }
     }
   }
   CFX_RectF rtChilds;
   rtChilds.Empty();
   FX_BOOL bChildIntersectWithDirty = FALSE;
   FX_BOOL bOrginPtIntersectWidthChild = FALSE;
   FX_BOOL bOrginPtIntersectWidthDirty =
       rtDirty.Contains(rtWidget.left, rtWidget.top);
-  static FWL_NEEDREPAINTHITDATA hitPoint[FWL_NEEDREPAINTHIT_Point];
+  static FWL_NEEDREPAINTHITDATA hitPoint[kNeedRepaintHitPoints];
   int32_t iSize = sizeof(FWL_NEEDREPAINTHITDATA);
   FXSYS_memset(hitPoint, 0, iSize);
-  FX_FLOAT fxPiece = rtWidget.width / FWL_NEEDREPAINTHIT_Piece;
-  FX_FLOAT fyPiece = rtWidget.height / FWL_NEEDREPAINTHIT_Piece;
+  FX_FLOAT fxPiece = rtWidget.width / kNeedRepaintHitPiece;
+  FX_FLOAT fyPiece = rtWidget.height / kNeedRepaintHitPiece;
   hitPoint[2].hitPoint.x = hitPoint[6].hitPoint.x = rtWidget.left;
   hitPoint[0].hitPoint.x = hitPoint[3].hitPoint.x = hitPoint[7].hitPoint.x =
       hitPoint[10].hitPoint.x = fxPiece + rtWidget.left;
   hitPoint[1].hitPoint.x = hitPoint[4].hitPoint.x = hitPoint[8].hitPoint.x =
       hitPoint[11].hitPoint.x = fxPiece * 2 + rtWidget.left;
   hitPoint[5].hitPoint.x = hitPoint[9].hitPoint.x =
       rtWidget.width + rtWidget.left;
   hitPoint[0].hitPoint.y = hitPoint[1].hitPoint.y = rtWidget.top;
   hitPoint[2].hitPoint.y = hitPoint[3].hitPoint.y = hitPoint[4].hitPoint.y =
       hitPoint[5].hitPoint.y = fyPiece + rtWidget.top;
@@ skipping 17 matching lines @@
       bChildIntersectWithDirty = TRUE;
     }
     if (bOrginPtIntersectWidthDirty && !bOrginPtIntersectWidthChild) {
       bOrginPtIntersectWidthChild = rect.Contains(0, 0);
     }
     if (rtChilds.IsEmpty()) {
       rtChilds = rect;
     } else if (!(pChild->GetStates() & FWL_WGTSTATE_Invisible)) {
       rtChilds.Union(rect);
     }
-    for (int32_t i = 0; i < FWL_NEEDREPAINTHIT_Point; i++) {
+    for (int32_t i = 0; i < kNeedRepaintHitPoints; i++) {
       if (hitPoint[i].bNotContainByDirty || hitPoint[i].bNotNeedRepaint) {
         continue;
       }
       if (!rtDirty.Contains(hitPoint[i].hitPoint)) {
         hitPoint[i].bNotContainByDirty = TRUE;
         continue;
       }
       if (r.Contains(hitPoint[i].hitPoint)) {
         hitPoint[i].bNotNeedRepaint = TRUE;
       }
     }
   } while ((pChild = FWL_GetWidgetMgr()->GetWidget(
                 pChild, FWL_WGTRELATION_NextSibling)) != NULL);
   if (!bChildIntersectWithDirty) {
     return TRUE;
   }
   if (bOrginPtIntersectWidthDirty && !bOrginPtIntersectWidthChild) {
     return TRUE;
   }
   if (rtChilds.IsEmpty()) {
     return TRUE;
   }
-  int32_t repaintPoint = FWL_NEEDREPAINTHIT_Point;
-  for (int32_t i = 0; i < FWL_NEEDREPAINTHIT_Point; i++) {
+  int32_t repaintPoint = kNeedRepaintHitPoints;
+  for (int32_t i = 0; i < kNeedRepaintHitPoints; i++) {
     if (hitPoint[i].bNotNeedRepaint) {
       repaintPoint--;
     }
   }
   if (repaintPoint > 0) {
     return TRUE;
   }
   pMatrix->TransformRect(rtChilds);
   if (rtChilds.Contains(rtDirty) || rtChilds.Contains(rtWidget)) {
     return FALSE;
@@ skipping 12 matching lines @@
     CFX_RectF temp(m_pWidgetMgr->m_rtScreen);
     temp.Deflate(50, 50);
     if (!temp.Contains(r)) {
       return FALSE;
     }
     pItem->bOutsideChanged = FALSE;
   }
 #endif
   return pItem->iRedrawCounter == 0;
 }