Fix all the code which has duplicate variable declarations

xfa/fxfa/parser/xfa_layout_itemlayout.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/fxfa/parser/xfa_layout_itemlayout.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 136 matching lines @@
             }
           }
           FX_FLOAT fRelSplitPos = fProposedSplitPos - fCurBottomMargin;
           for (CXFA_ContentLayoutItem* pChildItem =
                    (CXFA_ContentLayoutItem*)pLayoutItem->m_pFirstChild;
                pChildItem;
                pChildItem =
                    (CXFA_ContentLayoutItem*)pChildItem->m_pNextSibling) {
             FX_FLOAT fChildOffset =
                 fCurVerticalOffset + fCurTopMargin + pChildItem->m_sPos.y;
-            FX_BOOL bAppChange = FALSE;
+            FX_BOOL bChange = FALSE;
             if (FindLayoutItemSplitPos(pChildItem, fChildOffset, fRelSplitPos,
-                                       bAppChange, bCalculateMargin)) {
+                                       bChange, bCalculateMargin)) {
               if (fRelSplitPos - fChildOffset < XFA_LAYOUT_FLOAT_PERCISION &&
-                  bAppChange) {
+                  bChange) {
                 fProposedSplitPos = fRelSplitPos - fCurTopMargin;
               } else {
                 fProposedSplitPos = fRelSplitPos + fCurBottomMargin;
               }
               bAnyChanged = TRUE;
               bChanged = TRUE;
               if (fProposedSplitPos <=
                   fCurVerticalOffset + XFA_LAYOUT_FLOAT_PERCISION) {
                 return TRUE;
               }
@@ skipping 1743 matching lines @@
   }
   if (pTrailerNode && pFormNode) {
     pFormNode->RemoveChild(pTrailerNode);
   }
   if (pTrailerItem) {
     XFA_ReleaseLayoutItem(pTrailerItem);
   }
 }
 static XFA_ItemLayoutProcessorResult XFA_ItemLayoutProcessor_InsertFlowedItem(
     CXFA_ItemLayoutProcessor* pThis,
-    CXFA_ItemLayoutProcessor*& pProcessor,
+    CXFA_ItemLayoutProcessor* pProcessor,
     FX_BOOL bContainerWidthAutoSize,
     FX_BOOL bContainerHeightAutoSize,
     FX_FLOAT fContainerHeight,
     XFA_ATTRIBUTEENUM eFlowStrategy,
     uint8_t& uCurHAlignState,
-    CFX_ArrayTemplate<CXFA_ContentLayoutItem*>(&rgCurLineLayoutItems)[3],
+    CFX_ArrayTemplate<CXFA_ContentLayoutItem*> (&rgCurLineLayoutItems)[3],
     FX_BOOL bUseBreakControl,
     FX_FLOAT fAvailHeight,
     FX_FLOAT fRealHeight,
     FX_FLOAT& fContentCurRowY,
     FX_FLOAT& fContentWidthLimit,
     FX_FLOAT& fContentCurRowAvailWidth,
     FX_FLOAT& fContentCurRowHeight,
     FX_BOOL& bAddedItemInRow,
     FX_BOOL& bForceEndPage,
     CXFA_LayoutContext* pLayoutContext = NULL,
@@ skipping 317 matching lines @@
           }
         }
         return XFA_ItemLayoutProcessorResult_PageFullBreak;
       }
     }
   } else {
     return XFA_ItemLayoutProcessorResult_RowFullBreak;
   }
   return XFA_ItemLayoutProcessorResult_Done;
 }
+
 XFA_ItemLayoutProcessorResult CXFA_ItemLayoutProcessor::DoLayoutFlowedContainer(
     FX_BOOL bUseBreakControl,
     XFA_ATTRIBUTEENUM eFlowStrategy,
     FX_FLOAT fHeightLimit,
     FX_FLOAT fRealHeight,
     CXFA_LayoutContext* pContext,
     FX_BOOL bRootForceTb) {
   m_bHasAvailHeight = TRUE;
   FX_FLOAT fContainerWidth = 0, fContainerHeight = 0;
   FX_BOOL bBreakDone = FALSE;
@@ skipping 159 matching lines @@
       while (pLayoutNextTemp) {
         pLayoutNextTemp->m_pParent = NULL;
         CXFA_ContentLayoutItem* pSaveLayoutNext =
             (CXFA_ContentLayoutItem*)pLayoutNextTemp->m_pNextSibling;
         pLayoutNextTemp->m_pNextSibling = NULL;
         pLayoutNextTemp = pSaveLayoutNext;
       }
       pLayoutChild = NULL;
     }
     while (m_pCurChildNode) {
-      CXFA_ItemLayoutProcessor* pProcessor = NULL;
+      CXFA_ItemLayoutProcessor* pProcessor = nullptr;
       FX_BOOL bAddedItemInRow = FALSE;
       fContentCurRowY +=
           XFA_ItemLayoutProcessor_InsertPendingItems(this, m_pFormNode);
       switch (m_nCurChildNodeStage) {
         case XFA_ItemLayoutProcessorStages_Keep:
         case XFA_ItemLayoutProcessorStages_None:
           break;
         case XFA_ItemLayoutProcessorStages_BreakBefore: {
           for (int32_t iIndex = 0; iIndex < m_arrayKeepItems.GetSize();
                iIndex++) {
@@ skipping 11 matching lines @@
             if (JudgeLeaderOrTrailerForOccur(pLeaderNode)) {
               XFA_ItemLayoutProcessor_AddPendingNode(this, pLeaderNode, TRUE);
             }
             if (JudgeLeaderOrTrailerForOccur(pTrailerNode)) {
               if (m_pFormNode->GetNodeItem(XFA_NODEITEM_Parent)->GetClassID() ==
                       XFA_ELEMENT_Form &&
                   m_pLayoutItem == NULL) {
                 XFA_ItemLayoutProcessor_AddPendingNode(this, pTrailerNode,
                                                        TRUE);
               } else {
-                CXFA_ItemLayoutProcessor* pProcessor =
-                    new CXFA_ItemLayoutProcessor(pTrailerNode, NULL);
+                std::unique_ptr<CXFA_ItemLayoutProcessor> pTempProcessor(
+                    new CXFA_ItemLayoutProcessor(pTrailerNode, nullptr));
                 XFA_ItemLayoutProcessor_InsertFlowedItem(
-                    this, pProcessor, bContainerWidthAutoSize,
+                    this, pTempProcessor.get(), bContainerWidthAutoSize,
                     bContainerHeightAutoSize, fContainerHeight, eFlowStrategy,
                     uCurHAlignState, rgCurLineLayoutItems, FALSE,
                     XFA_LAYOUT_FLOAT_MAX, XFA_LAYOUT_FLOAT_MAX, fContentCurRowY,
                     fContentWidthLimit, fContentCurRowAvailWidth,
                     fContentCurRowHeight, bAddedItemInRow, bForceEndPage,
                     pContext);
-                delete pProcessor;
-                pProcessor = NULL;
               }
             }
             XFA_ItemLayoutProcessor_GotoNextContainerNode(
                 m_pCurChildNode, m_nCurChildNodeStage, m_pFormNode, TRUE);
             bForceEndPage = TRUE;
             bIsManualBreak = TRUE;
             goto SuspendAndCreateNewRow;
           }
         } break;
         case XFA_ItemLayoutProcessorStages_BreakAfter: {
           CXFA_Node *pLeaderNode = NULL, *pTrailerNode = NULL;
           FX_BOOL bCreatePage = FALSE;
           if (bUseBreakControl && m_pPageMgr &&
               m_pPageMgr->ProcessBreakBeforeOrAfter(m_pCurChildNode, FALSE,
                                                     pLeaderNode, pTrailerNode,
                                                     bCreatePage) &&
               m_pFormNode->GetClassID() != XFA_ELEMENT_Form) {
             if (JudgeLeaderOrTrailerForOccur(pTrailerNode)) {
-              CXFA_ItemLayoutProcessor* pProcessor =
-                  new CXFA_ItemLayoutProcessor(pTrailerNode, NULL);
+              std::unique_ptr<CXFA_ItemLayoutProcessor> pTempProcessor(
+                  new CXFA_ItemLayoutProcessor(pTrailerNode, nullptr));
               XFA_ItemLayoutProcessor_InsertFlowedItem(
-                  this, pProcessor, bContainerWidthAutoSize,
+                  this, pTempProcessor.get(), bContainerWidthAutoSize,
                   bContainerHeightAutoSize, fContainerHeight, eFlowStrategy,
                   uCurHAlignState, rgCurLineLayoutItems, FALSE,
                   XFA_LAYOUT_FLOAT_MAX, XFA_LAYOUT_FLOAT_MAX, fContentCurRowY,
                   fContentWidthLimit, fContentCurRowAvailWidth,
                   fContentCurRowHeight, bAddedItemInRow, bForceEndPage,
                   pContext);
-              delete pProcessor;
-              pProcessor = NULL;
             }
             if (!bCreatePage) {
               if (JudgeLeaderOrTrailerForOccur(pLeaderNode)) {
                 CalculateRowChildPosition(
                     rgCurLineLayoutItems, eFlowStrategy,
                     bContainerHeightAutoSize, bContainerWidthAutoSize,
                     fContentCalculatedWidth, fContentCalculatedHeight,
                     fContentCurRowY, fContentCurRowHeight, fContentWidthLimit);
                 rgCurLineLayoutItems->RemoveAll();
-                CXFA_ItemLayoutProcessor* pProcessor =
-                    new CXFA_ItemLayoutProcessor(pLeaderNode, NULL);
+                std::unique_ptr<CXFA_ItemLayoutProcessor> pTempProcessor(
+                    new CXFA_ItemLayoutProcessor(pLeaderNode, nullptr));
                 XFA_ItemLayoutProcessor_InsertFlowedItem(
-                    this, pProcessor, bContainerWidthAutoSize,
+                    this, pTempProcessor.get(), bContainerWidthAutoSize,
                     bContainerHeightAutoSize, fContainerHeight, eFlowStrategy,
                     uCurHAlignState, rgCurLineLayoutItems, FALSE,
                     XFA_LAYOUT_FLOAT_MAX, XFA_LAYOUT_FLOAT_MAX, fContentCurRowY,
                     fContentWidthLimit, fContentCurRowAvailWidth,
                     fContentCurRowHeight, bAddedItemInRow, bForceEndPage,
                     pContext);
-                delete pProcessor;
-                pProcessor = NULL;
               }
             } else {
               if (JudgeLeaderOrTrailerForOccur(pLeaderNode)) {
                 XFA_ItemLayoutProcessor_AddPendingNode(this, pLeaderNode, TRUE);
               }
             }
             XFA_ItemLayoutProcessor_GotoNextContainerNode(
                 m_pCurChildNode, m_nCurChildNodeStage, m_pFormNode, TRUE);
             if (bCreatePage) {
               bForceEndPage = TRUE;
@@ skipping 155 matching lines @@
       m_fUsedSize = 0;
     } else {
       m_fUsedSize += m_pLayoutItem->m_sSize.y;
     }
   }
   return bRetValue
              ? XFA_ItemLayoutProcessorResult_Done
              : (bIsManualBreak ? XFA_ItemLayoutProcessorResult_ManualBreak
                                : XFA_ItemLayoutProcessorResult_PageFullBreak);
 }
+
 FX_BOOL CXFA_ItemLayoutProcessor::CalculateRowChildPosition(
     CFX_ArrayTemplate<CXFA_ContentLayoutItem*>(&rgCurLineLayoutItems)[3],
     XFA_ATTRIBUTEENUM eFlowStrategy,
     FX_BOOL bContainerHeightAutoSize,
     FX_BOOL bContainerWidthAutoSize,
     FX_FLOAT& fContentCalculatedWidth,
     FX_FLOAT& fContentCalculatedHeight,
     FX_FLOAT& fContentCurRowY,
     FX_FLOAT fContentCurRowHeight,
     FX_FLOAT fContentWidthLimit,
@@ skipping 260 matching lines @@
   if (iMax < 0)
     return TRUE;
 
   int32_t iCount = m_PendingNodesCount[pTemplate];
   if (iCount >= iMax)
     return FALSE;
 
   m_PendingNodesCount[pTemplate] = iCount + 1;
   return TRUE;
 }