commit cc6297d77f516988012af669a2646fde2c9cad15
author Lei Zhang <thestig@chromium.org> Wed Feb 13 19:04:05 2019 +0000
committer Chromium commit bot <commit-bot@chromium.org> Wed Feb 13 19:04:05 2019 +0000
tree ceefadcce79dd5d93d7ea88de3e781b56e08e48e
parent b2f59ad0a5904129590a4ad0f64b56c287cd2c39

Reflow CXFA_ItemLayoutProcessor::GotoNextContainerNode().

Get rid of goto statements.

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

xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp

diff --git a/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
index d61db05..3eddc98 100644
--- a/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_itemlayoutprocessor.cpp
@@ -856,7 +856,7 @@
       ret = HandleKeep(pChildContainer->GetFirstChild(), pCurActionNode);
       if (ret.has_value())
         return ret.value();
-      goto CheckNextChildContainer;
+      break;
 
     case Stage::kNone:
       *pCurActionNode = nullptr;
@@ -874,7 +874,7 @@
       ret = HandleBreakBefore(pChildContainer, pCurActionNode);
       if (ret.has_value())
         return ret.value();
-      goto CheckNextChildContainer;
+      break;
 
     case Stage::kContainer:
       *pCurActionNode = nullptr;
@@ -884,26 +884,31 @@
       ret = HandleBreakAfter(pChildContainer, pCurActionNode);
       if (ret.has_value())
         return ret.value();
+      break;
 
-    CheckNextChildContainer : {
-      ret = HandleCheckNextChildContainer(pParentContainer, pChildContainer,
-                                          pCurActionNode);
+    case Stage::kBookendTrailer:
+      ret = HandleBookendTrailer(pParentContainer, pCurActionNode);
       if (ret.has_value())
         return ret.value();
-
-      *pCurActionNode = nullptr;
-      FALLTHROUGH;
-      case Stage::kBookendTrailer:
-        ret = HandleBookendTrailer(pParentContainer, pCurActionNode);
-        if (ret.has_value())
-          return ret.value();
-    }
       FALLTHROUGH;
 
     default:
       *pCurActionNode = nullptr;
       return Stage::kDone;
   }
+
+  ret = HandleCheckNextChildContainer(pParentContainer, pChildContainer,
+                                      pCurActionNode);
+  if (ret.has_value())
+    return ret.value();
+
+  *pCurActionNode = nullptr;
+  ret = HandleBookendTrailer(pParentContainer, pCurActionNode);
+  if (ret.has_value())
+    return ret.value();
+
+  *pCurActionNode = nullptr;
+  return Stage::kDone;
 }
 
 Optional<CXFA_ItemLayoutProcessor::Stage>