commit a7adcb62c61b624aa5138efce62f199cce13fe33
author Tom Sepez <tsepez@chromium.org> Thu Aug 25 22:58:43 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Aug 25 22:58:43 2022 +0000
tree 7ca6473d56ad8809cb6dda91f222c64a6576bef2
parent f28915d98ab049ff928106c1b636b06a56c4d290

Re-work some HasCurrentViewRecord() calls.

Redundant now that GetCurrentViewRecord() does this for us.

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

xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
index ac43d9c..d2a68cc 100644
--- a/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_viewlayoutprocessor.cpp
@@ -531,14 +531,13 @@
     CXFA_ContentLayoutItem* pContentLayoutItem,
     CXFA_ContentLayoutProcessor::Result eStatus) {
   if (pContentLayoutItem) {
-    if (!HasCurrentViewRecord())
+    CXFA_ViewRecord* pViewRecord = GetCurrentViewRecord();
+    if (!pViewRecord)
       return;
 
-    GetCurrentViewRecord()->pCurContentArea->AppendLastChild(
-        pContentLayoutItem);
+    pViewRecord->pCurContentArea->AppendLastChild(pContentLayoutItem);
     m_bCreateOverFlowPage = false;
   }
-
   if (eStatus != CXFA_ContentLayoutProcessor::Result::kDone) {
     if (eStatus == CXFA_ContentLayoutProcessor::Result::kPageFullBreak &&
         m_CurrentViewRecordIter == GetTailPosition()) {
@@ -550,10 +549,11 @@
 }
 
 float CXFA_ViewLayoutProcessor::GetAvailHeight() {
-  if (!HasCurrentViewRecord())
+  CXFA_ViewRecord* pViewRecord = GetCurrentViewRecord();
+  if (!pViewRecord)
     return 0.0f;
 
-  CXFA_ViewLayoutItem* pLayoutItem = GetCurrentViewRecord()->pCurContentArea;
+  CXFA_ViewLayoutItem* pLayoutItem = pViewRecord->pCurContentArea;
   if (!pLayoutItem || !pLayoutItem->GetFormNode())
     return 0.0f;
 
@@ -645,8 +645,9 @@
 CXFA_ViewLayoutProcessor::CreateViewRecordSimple() {
   auto* pNewRecord = cppgc::MakeGarbageCollected<CXFA_ViewRecord>(
       GetHeap()->GetAllocationHandle());
-  if (HasCurrentViewRecord())
-    *pNewRecord = *GetCurrentViewRecord();
+  CXFA_ViewRecord* pCurrentRecord = GetCurrentViewRecord();
+  if (pCurrentRecord)
+    *pNewRecord = *pCurrentRecord;
   else
     pNewRecord->pCurPageSet = m_pPageSetRootLayoutItem;
   AppendNewRecord(pNewRecord);
@@ -1523,10 +1524,11 @@
 }
 
 bool CXFA_ViewLayoutProcessor::GetNextAvailContentHeight(float fChildHeight) {
-  if (!HasCurrentViewRecord())
+  CXFA_ViewRecord* pViewRecord = GetCurrentViewRecord();
+  if (!pViewRecord)
     return false;
-  CXFA_Node* pCurContentNode =
-      GetCurrentViewRecord()->pCurContentArea->GetFormNode();
+
+  CXFA_Node* pCurContentNode = pViewRecord->pCurContentArea->GetFormNode();
   if (!pCurContentNode)
     return false;