commit ad046fa88e1b5abbc65c0acab632bb39bc95eb21
author Lei Zhang <thestig@chromium.org> Fri Mar 22 23:25:37 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Mar 22 23:25:37 2019 +0000
tree a9fdf32a06386f1362be25fbb412edb69d9a376e
parent 7daf7a2776c1a9d75419d07582db0db51221179f

Return a CXFA_Node* from CXFA_LayoutPageMgr::ResolveBookendLeaderOrTrailer().

The callers will always check the CXFA_Node* value, so do not bother
returning a bool.

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

xfa/fxfa/layout/cxfa_layoutpagemgr.cpp

diff --git a/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp b/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp
index 2d6da94..de4d152 100644
--- a/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp
@@ -895,12 +895,11 @@
 CXFA_Node* CXFA_LayoutPageMgr::ProcessBookendLeaderOrTrailer(
     const CXFA_Node* pBookendNode,
     bool bLeader) {
-  CXFA_Node* pLeaderTemplate = nullptr;
   CXFA_Node* pFormNode = pBookendNode->GetContainerParent();
-  if (!ResolveBookendLeaderOrTrailer(pBookendNode, bLeader, pLeaderTemplate) ||
-      !pLeaderTemplate) {
+  CXFA_Node* pLeaderTemplate =
+      ResolveBookendLeaderOrTrailer(pBookendNode, bLeader);
+  if (!pLeaderTemplate)
     return nullptr;
-  }
 
   CXFA_Document* pDocument = pBookendNode->GetDocument();
   CXFA_Node* pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
@@ -1052,29 +1051,25 @@
   return false;
 }
 
-bool CXFA_LayoutPageMgr::ResolveBookendLeaderOrTrailer(
+CXFA_Node* CXFA_LayoutPageMgr::ResolveBookendLeaderOrTrailer(
     const CXFA_Node* pBookendNode,
-    bool bLeader,
-    CXFA_Node*& pBookendAppendTemplate) {
+    bool bLeader) {
   CXFA_Node* pContainer =
       pBookendNode->GetContainerParent()->GetTemplateNodeIfExists();
   if (pBookendNode->GetElementType() == XFA_Element::Break) {
     WideString leader = pBookendNode->JSObject()->GetCData(
         bLeader ? XFA_Attribute::BookendLeader : XFA_Attribute::BookendTrailer);
     if (leader.IsEmpty())
-      return false;
-
-    pBookendAppendTemplate = ResolveBreakTarget(pContainer, false, leader);
-    return true;
+      return nullptr;
+    return ResolveBreakTarget(pContainer, false, leader);
   }
 
   if (pBookendNode->GetElementType() != XFA_Element::Bookend)
-    return false;
+    return nullptr;
 
   WideString leader = pBookendNode->JSObject()->GetCData(
       bLeader ? XFA_Attribute::Leader : XFA_Attribute::Trailer);
-  pBookendAppendTemplate = ResolveBreakTarget(pContainer, true, leader);
-  return true;
+  return ResolveBreakTarget(pContainer, true, leader);
 }
 
 bool CXFA_LayoutPageMgr::FindPageAreaFromPageSet(CXFA_Node* pPageSet,

xfa/fxfa/layout/cxfa_layoutpagemgr.h

diff --git a/xfa/fxfa/layout/cxfa_layoutpagemgr.h b/xfa/fxfa/layout/cxfa_layoutpagemgr.h
index f54e2bb..8d3471b 100644
--- a/xfa/fxfa/layout/cxfa_layoutpagemgr.h
+++ b/xfa/fxfa/layout/cxfa_layoutpagemgr.h
@@ -80,9 +80,8 @@
                            bool bCreatePage);
   CXFA_Node* ProcessBookendLeaderOrTrailer(const CXFA_Node* pBookendNode,
                                            bool bLeader);
-  bool ResolveBookendLeaderOrTrailer(const CXFA_Node* pBookendNode,
-                                     bool bLeader,
-                                     CXFA_Node*& pBookendAppendTemplate);
+  CXFA_Node* ResolveBookendLeaderOrTrailer(const CXFA_Node* pBookendNode,
+                                           bool bLeader);
   bool ExecuteBreakBeforeOrAfter(CXFA_Node* pCurNode,
                                  bool bBefore,
                                  CXFA_Node*& pBreakLeaderTemplate,