commit 3de08dd61026197fd08f8243ca214cf39b6f20ee
author Lei Zhang <thestig@chromium.org> Fri Dec 14 22:11:11 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Dec 14 22:11:11 2018 +0000
tree d7491c01fbf9b4cb430794db93a141d569c24766
parent 97ad59c42f98211a17912b3bcb11cd4b1d61fed0

Remove some non-const references in CXFA_ItemLayoutProcessor.

Change-Id: I81383d273aabb3d93f3cdee68f309e91aa33b483
Reviewed-on: https://pdfium-review.googlesource.com/c/47274
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp

diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
index 82905e2..f30f843 100644
--- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
+++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.cpp
@@ -901,7 +901,7 @@
               return;
             }
             if (m_bIsProcessKeep) {
-              if (ProcessKeepNodesForBreakBefore(pCurActionNode, nCurStage,
+              if (ProcessKeepNodesForBreakBefore(&pCurActionNode, nCurStage,
                                                  pChildContainer)) {
                 return;
               }
@@ -951,8 +951,8 @@
         goto NoMoreChildContainer;
 
       bool bLastKeep = false;
-      if (ProcessKeepNodesForCheckNext(pCurActionNode, nCurStage,
-                                       pNextChildContainer, bLastKeep)) {
+      if (ProcessKeepNodesForCheckNext(&pCurActionNode, nCurStage,
+                                       &pNextChildContainer, &bLastKeep)) {
         return;
       }
       if (!m_bKeepBreakFinish && !bLastKeep &&
@@ -995,52 +995,49 @@
 }
 
 bool CXFA_ItemLayoutProcessor::ProcessKeepNodesForCheckNext(
-    CXFA_Node*& pCurActionNode,
+    CXFA_Node** pCurActionNode,
     XFA_ItemLayoutProcessorStages* nCurStage,
-    CXFA_Node*& pNextContainer,
-    bool& bLastKeepNode) {
+    CXFA_Node** pNextContainer,
+    bool* pLastKeepNode) {
   const bool bCanSplit =
-      pNextContainer->GetIntact() == XFA_AttributeValue::None;
-  bool bNextKeep = false;
-  if (ExistContainerKeep(pNextContainer, false))
-    bNextKeep = true;
+      (*pNextContainer)->GetIntact() == XFA_AttributeValue::None;
+  const bool bNextKeep = ExistContainerKeep(*pNextContainer, false);
 
   if (bNextKeep && !bCanSplit) {
     if (!m_bIsProcessKeep && !m_bKeepBreakFinish) {
-      m_pKeepHeadNode = pNextContainer;
+      m_pKeepHeadNode = *pNextContainer;
       m_bIsProcessKeep = true;
     }
     return false;
   }
 
-  if (m_bIsProcessKeep && m_pKeepHeadNode) {
-    m_pKeepTailNode = pNextContainer;
-    if (!m_bKeepBreakFinish &&
-        FindBreakNode(pNextContainer->GetFirstChild(), true, &pCurActionNode,
-                      nCurStage)) {
-      return true;
-    }
+  if (!m_bIsProcessKeep || !m_pKeepHeadNode) {
+    if (m_bKeepBreakFinish)
+      *pLastKeepNode = true;
+    m_bKeepBreakFinish = false;
+    return false;
+  }
 
-    pNextContainer = m_pKeepHeadNode;
+  m_pKeepTailNode = *pNextContainer;
+  if (m_bKeepBreakFinish || !FindBreakNode((*pNextContainer)->GetFirstChild(),
+                                           true, pCurActionNode, nCurStage)) {
+    *pNextContainer = m_pKeepHeadNode;
     m_bKeepBreakFinish = true;
     m_pKeepHeadNode = nullptr;
     m_pKeepTailNode = nullptr;
     m_bIsProcessKeep = false;
-  } else {
-    if (m_bKeepBreakFinish)
-      bLastKeepNode = true;
-    m_bKeepBreakFinish = false;
+    return false;
   }
 
-  return false;
+  return true;
 }
 
 bool CXFA_ItemLayoutProcessor::ProcessKeepNodesForBreakBefore(
-    CXFA_Node*& pCurActionNode,
+    CXFA_Node** pCurActionNode,
     XFA_ItemLayoutProcessorStages* nCurStage,
     CXFA_Node* pContainerNode) {
   if (m_pKeepTailNode == pContainerNode) {
-    pCurActionNode = m_pKeepHeadNode;
+    *pCurActionNode = m_pKeepHeadNode;
     m_bKeepBreakFinish = true;
     m_pKeepHeadNode = nullptr;
     m_pKeepTailNode = nullptr;
@@ -1050,7 +1047,7 @@
   }
 
   CXFA_Node* pBreakAfterNode = pContainerNode->GetFirstChild();
-  return FindBreakNode(pBreakAfterNode, false, &pCurActionNode, nCurStage);
+  return FindBreakNode(pBreakAfterNode, false, pCurActionNode, nCurStage);
 }
 
 void CXFA_ItemLayoutProcessor::DoLayoutPageArea(

xfa/fxfa/parser/cxfa_itemlayoutprocessor.h

diff --git a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h
index 70eb870..f545868 100644
--- a/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h
+++ b/xfa/fxfa/parser/cxfa_itemlayoutprocessor.h
@@ -124,12 +124,12 @@
                              CXFA_Node* pParentContainer,
                              bool bUsePageBreak);
 
-  bool ProcessKeepNodesForCheckNext(CXFA_Node*& pCurActionNode,
+  bool ProcessKeepNodesForCheckNext(CXFA_Node** pCurActionNode,
                                     XFA_ItemLayoutProcessorStages* nCurStage,
-                                    CXFA_Node*& pNextContainer,
-                                    bool& bLastKeepNode);
+                                    CXFA_Node** pNextContainer,
+                                    bool* pLastKeepNode);
 
-  bool ProcessKeepNodesForBreakBefore(CXFA_Node*& pCurActionNode,
+  bool ProcessKeepNodesForBreakBefore(CXFA_Node** pCurActionNode,
                                       XFA_ItemLayoutProcessorStages* nCurStage,
                                       CXFA_Node* pContainerNode);