Merge to XFA - else after returns.

core/src/fpdfdoc/doc_ap.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
 #include "../../include/fpdfdoc/fpdf_ap.h"
 FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict)
 {
     if (!pAnnotDict || pAnnotDict->GetConstString("Subtype") != FX_BSTRC("Widget")) {
         return FALSE;
     }
     CFX_ByteString field_type = FPDF_GetFieldAttr(pAnnotDict, "FT")->GetString();
     FX_DWORD flags = FPDF_GetFieldAttr(pAnnotDict, "Ff")? FPDF_GetFieldAttr(pAnnotDict, "Ff")->GetInteger() : 0;
     if (field_type == "Tx") {
         return CPVT_GenerateAP::GenerateTextFieldAP(pDoc, pAnnotDict);
-    } else if (field_type == "Ch") {
-        if (flags & (1 << 17)) {
-            return CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict);
-        } else {
-            return CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict);
-        }
-    } else if (field_type == "Btn") {
+    }
+    if (field_type == "Ch") {
+        return (flags & (1 << 17)) ?
+                CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict) :
+                CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict);
+    }
+    if (field_type == "Btn") {
         if (!(flags & (1 << 16))) {
             if (!pAnnotDict->KeyExist("AS")) {
                 if (CPDF_Dictionary* pParentDict = pAnnotDict->GetDict("Parent")) {
                     if (pParentDict->KeyExist("AS")) {
                         pAnnotDict->SetAtString("AS", pParentDict->GetString("AS"));
                     }
                 }
             }
         }
     }
@@ skipping 764 matching lines @@
         case CT_GRAY:
             sColorStream << color.fColor1 << " " << (bFillOrStroke ? "g" : "G") << "\n";
             break;
         case CT_CMYK:
             sColorStream << color.fColor1 << " " << color.fColor2 << " " << color.fColor3 << " " << color.fColor4 << " "
                          << (bFillOrStroke ? "k" : "K") << "\n";
             break;
     }
     return sColorStream.GetByteString();
 }