commit afc49799f527fe4b2af6e1e09e113da9d37d6369
author Lei Zhang <thestig@chromium.org> Thu Feb 21 18:37:43 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Feb 21 18:37:43 2019 +0000
tree 265338bf31f2791176238471c66b5dc996ec1dfd
parent a5230e24c600745a3f8f93e4ded2015b432895ba

Use early return in CXFA_LayoutPageMgr::ProcessBreakBeforeOrAfter().

Change-Id: I1a59e7c23f9b7ca599beaa1bb273b8e0600c84ca
Reviewed-on: https://pdfium-review.googlesource.com/c/50991
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@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 967f377..76c9192 100644
--- a/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp
+++ b/xfa/fxfa/layout/cxfa_layoutpagemgr.cpp
@@ -888,33 +888,33 @@
   CXFA_Node* pLeaderTemplate = nullptr;
   CXFA_Node* pTrailerTemplate = nullptr;
   CXFA_Node* pFormNode = pBreakNode->GetContainerParent();
-  if (pFormNode->PresenceRequiresSpace()) {
-    bCreatePage = ExecuteBreakBeforeOrAfter(pBreakNode, bBefore,
-                                            pLeaderTemplate, pTrailerTemplate);
-    CXFA_Document* pDocument = pBreakNode->GetDocument();
-    CXFA_Node* pDataScope = nullptr;
-    pFormNode = pFormNode->GetContainerParent();
-    if (pLeaderTemplate) {
-      if (!pDataScope)
-        pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
+  if (!pFormNode->PresenceRequiresSpace())
+    return false;
 
-      pBreakLeaderNode = pDocument->DataMerge_CopyContainer(
-          pLeaderTemplate, pFormNode, pDataScope, true, true, true);
-      pDocument->DataMerge_UpdateBindingRelations(pBreakLeaderNode);
-      SetLayoutGeneratedNodeFlag(pBreakLeaderNode);
-    }
-    if (pTrailerTemplate) {
-      if (!pDataScope)
-        pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
+  bCreatePage = ExecuteBreakBeforeOrAfter(pBreakNode, bBefore, pLeaderTemplate,
+                                          pTrailerTemplate);
+  CXFA_Document* pDocument = pBreakNode->GetDocument();
+  CXFA_Node* pDataScope = nullptr;
+  pFormNode = pFormNode->GetContainerParent();
+  if (pLeaderTemplate) {
+    if (!pDataScope)
+      pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
 
-      pBreakTrailerNode = pDocument->DataMerge_CopyContainer(
-          pTrailerTemplate, pFormNode, pDataScope, true, true, true);
-      pDocument->DataMerge_UpdateBindingRelations(pBreakTrailerNode);
-      SetLayoutGeneratedNodeFlag(pBreakTrailerNode);
-    }
-    return true;
+    pBreakLeaderNode = pDocument->DataMerge_CopyContainer(
+        pLeaderTemplate, pFormNode, pDataScope, true, true, true);
+    pDocument->DataMerge_UpdateBindingRelations(pBreakLeaderNode);
+    SetLayoutGeneratedNodeFlag(pBreakLeaderNode);
   }
-  return false;
+  if (pTrailerTemplate) {
+    if (!pDataScope)
+      pDataScope = XFA_DataMerge_FindDataScope(pFormNode);
+
+    pBreakTrailerNode = pDocument->DataMerge_CopyContainer(
+        pTrailerTemplate, pFormNode, pDataScope, true, true, true);
+    pDocument->DataMerge_UpdateBindingRelations(pBreakTrailerNode);
+    SetLayoutGeneratedNodeFlag(pBreakTrailerNode);
+  }
+  return true;
 }
 
 bool CXFA_LayoutPageMgr::ProcessBookendLeaderOrTrailer(