Re-land else-after-returns

core/src/fpdfdoc/doc_ap.cpp

Index: core/src/fpdfdoc/doc_ap.cpp
diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp
index 2d991b39c2b17403279a2e355028fea7d40f4e0e..f94a4d60e09d28f3e09577dd010e6866743ee1fc 100644
--- a/core/src/fpdfdoc/doc_ap.cpp
+++ b/core/src/fpdfdoc/doc_ap.cpp
@@ -17,13 +17,13 @@ FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict)
     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")) {