From 9d47de6b27b167db46b6aba38352fc42a8b6adae Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Thu, 16 Nov 2017 14:07:17 +0000
Subject: Convert TryEnum to return an optional

This CL converts CJX_Node::TryEnum to return a pdfium::Optional instead
of a bool with an out parameter.

Change-Id: Icc1b063ce51656cc5e467aba358eb9e7d6754fea
Reviewed-on: https://pdfium-review.googlesource.com/18512
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
 xfa/fxfa/parser/cxfa_node.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'xfa/fxfa/parser/cxfa_node.cpp')

diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 5a375c7f2a..90579ff5e2 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -568,9 +568,10 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
   CXFA_Node* pKeep = GetFirstChildByClass(XFA_Element::Keep);
   XFA_ATTRIBUTEENUM eLayoutType = JSNode()->GetEnum(XFA_Attribute::Layout);
   if (pKeep) {
-    XFA_ATTRIBUTEENUM eIntact;
-    if (pKeep->JSNode()->TryEnum(XFA_Attribute::Intact, eIntact, false)) {
-      if (eIntact == XFA_ATTRIBUTEENUM_None &&
+    pdfium::Optional<XFA_ATTRIBUTEENUM> intact =
+        pKeep->JSNode()->TryEnum(XFA_Attribute::Intact, false);
+    if (intact) {
+      if (*intact == XFA_ATTRIBUTEENUM_None &&
           eLayoutType == XFA_ATTRIBUTEENUM_Row &&
           m_pDocument->GetCurVersionMode() < XFA_VERSION_208) {
         CXFA_Node* pPreviewRow = GetNodeItem(XFA_NODEITEM_PrevSibling,
@@ -578,24 +579,25 @@ XFA_ATTRIBUTEENUM CXFA_Node::GetIntact() {
         if (pPreviewRow &&
             pPreviewRow->JSNode()->GetEnum(XFA_Attribute::Layout) ==
                 XFA_ATTRIBUTEENUM_Row) {
-          XFA_ATTRIBUTEENUM eValue;
-          if (pKeep->JSNode()->TryEnum(XFA_Attribute::Previous, eValue,
-                                       false) &&
-              (eValue == XFA_ATTRIBUTEENUM_ContentArea ||
-               eValue == XFA_ATTRIBUTEENUM_PageArea)) {
+          pdfium::Optional<XFA_ATTRIBUTEENUM> value =
+              pKeep->JSNode()->TryEnum(XFA_Attribute::Previous, false);
+          if (value && (*value == XFA_ATTRIBUTEENUM_ContentArea ||
+                        *value == XFA_ATTRIBUTEENUM_PageArea)) {
             return XFA_ATTRIBUTEENUM_ContentArea;
           }
+
           CXFA_Node* pNode =
               pPreviewRow->GetFirstChildByClass(XFA_Element::Keep);
-          if (pNode &&
-              pNode->JSNode()->TryEnum(XFA_Attribute::Next, eValue, false) &&
-              (eValue == XFA_ATTRIBUTEENUM_ContentArea ||
-               eValue == XFA_ATTRIBUTEENUM_PageArea)) {
+          pdfium::Optional<XFA_ATTRIBUTEENUM> ret;
+          if (pNode)
+            ret = pNode->JSNode()->TryEnum(XFA_Attribute::Next, false);
+          if (ret && (*ret == XFA_ATTRIBUTEENUM_ContentArea ||
+                      *ret == XFA_ATTRIBUTEENUM_PageArea)) {
             return XFA_ATTRIBUTEENUM_ContentArea;
           }
         }
       }
-      return eIntact;
+      return *intact;
     }
   }
   switch (GetElementType()) {
-- 
cgit v1.2.3