commit f291f45022462a74a328ecd8b051f57f871e1c98
author Tom Sepez <tsepez@chromium.org> Fri Jul 31 22:17:15 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Jul 31 22:17:15 2020 +0000
tree 5e752ad12f374f3a0729ddffb257fed700ab263b
parent bd9fea3cfc8e3420bc9f5e0b1c84fde0c55df7f1

Make |CXFA_ViewLayoutItem::m_pOldSubform| a private member

Added GetOldSubform() and SetOldSubform() accessor methods.

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

xfa/fxfa/layout/cxfa_viewlayoutitem.h

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutitem.h b/xfa/fxfa/layout/cxfa_viewlayoutitem.h
index f4c8779..f25366c 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutitem.h
+++ b/xfa/fxfa/layout/cxfa_viewlayoutitem.h
@@ -24,14 +24,15 @@
   int32_t GetPageIndex() const;
   CFX_SizeF GetPageSize() const;
   CXFA_Node* GetMasterPage() const;
-
-  UnownedPtr<CXFA_Node> m_pOldSubform;
+  CXFA_Node* GetOldSubform() const { return m_pOldSubform.Get(); }
+  void SetOldSubform(CXFA_Node* pSubform) { m_pOldSubform = pSubform; }
 
  private:
   CXFA_ViewLayoutItem(CXFA_Node* pNode,
                       std::unique_ptr<CXFA_FFPageView> pPageView);
 
   std::unique_ptr<CXFA_FFPageView> const m_pFFPageView;
+  UnownedPtr<CXFA_Node> m_pOldSubform;
 };
 
 #endif  // XFA_FXFA_LAYOUT_CXFA_VIEWLAYOUTITEM_H_

xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
index 5dd2a3e..3c52198 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
@@ -1710,8 +1710,8 @@
           }
           if (bIsExistForm) {
             CXFA_Node* pNewSubform = pFormLayout->GetFormNode();
-            if (pViewItem->m_pOldSubform &&
-                pViewItem->m_pOldSubform != pNewSubform) {
+            if (pViewItem->GetOldSubform() &&
+                pViewItem->GetOldSubform() != pNewSubform) {
               CXFA_Node* pExistingNode = XFA_DataMerge_FindFormDOMInstance(
                   pDocument, pViewItem->GetFormNode()->GetElementType(),
                   pViewItem->GetFormNode()->GetNameHash(), pParentNode);
@@ -1732,7 +1732,7 @@
                 pParentNode->RemoveChildAndNotify(pExistingNode, true);
               }
             }
-            pViewItem->m_pOldSubform = pNewSubform;
+            pViewItem->SetOldSubform(pNewSubform);
           }
           CXFA_Node* pOldNode = pViewItem->GetFormNode();
           CXFA_Node* pNewNode = pDocument->DataMerge_CopyContainer(