Merge to XFA - else after returns.

core/src/fxge/ge/fx_ge_fontmap.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 <limits>
 
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
@@ skipping 687 matching lines @@
 uint8_t _GetCharsetFromCodePage(FX_WORD codepage)
 {
     int32_t iEnd = sizeof(g_Codepage2CharsetTable) / sizeof(CHARSET_MAP) - 1;
     FXSYS_assert(iEnd >= 0);
     int32_t iStart = 0, iMid;
     do {
         iMid = (iStart + iEnd) / 2;
         const CHARSET_MAP & cp = g_Codepage2CharsetTable[iMid];
         if (codepage == cp.codepage) {
             return cp.charset;
-        } else if (codepage < cp.codepage) {
+        }
+        if (codepage < cp.codepage) {
             iEnd = iMid - 1;
         } else {
             iStart = iMid + 1;
         }
     } while (iStart <= iEnd);
     return 1;
 }
 FX_DWORD _GetCodePageRangeFromCharset(int charset)
 {
     if (charset == FXFONT_EASTEUROPE_CHARSET) {
@@ skipping 453 matching lines @@
                     pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
                     pSubstFont->m_Charset = FXFONT_SYMBOL_CHARSET;
                     if (m_FoxitFaces[12]) {
                         return m_FoxitFaces[12];
                     }
                     const uint8_t* pFontData = NULL;
                     FX_DWORD size = 0;
                     m_pFontMgr->GetStandardFont(pFontData, size, 12);
                     m_FoxitFaces[12] = m_pFontMgr->GetFixedFace(pFontData, size, 0);
                     return m_FoxitFaces[12];
-                } else {
-                    pSubstFont->m_SubstFlags |= FXFONT_SUBST_NONSYMBOL;
-                    return FindSubstFont(family, bTrueType, flags & ~FXFONT_SYMBOLIC, weight, italic_angle, 0, pSubstFont);
                 }
-#else
+#endif
                 pSubstFont->m_SubstFlags |= FXFONT_SUBST_NONSYMBOL;
                 return FindSubstFont(family, bTrueType, flags & ~FXFONT_SYMBOLIC, weight, italic_angle, 0, pSubstFont);
-#endif
             }
             if (Charset == FXFONT_ANSI_CHARSET) {
                 pSubstFont->m_SubstFlags |= FXFONT_SUBST_STANDARD;
                 return UseInternalSubst(pSubstFont, iBaseFont, italic_angle, old_weight, PitchFamily);
             }
             int index = m_CharsetArray.Find(Charset);
             if (index < 0) {
                 return UseInternalSubst(pSubstFont, iBaseFont, italic_angle, old_weight, PitchFamily);
-            } else {
-                hFont = m_pFontInfo->GetFont(m_FaceArray[index]);
             }
+            hFont = m_pFontInfo->GetFont(m_FaceArray[index]);
         }
     }
     pSubstFont->m_ExtHandle = m_pFontInfo->RetainFont(hFont);
     if (hFont == NULL) {
         return NULL;
     }
     m_pFontInfo->GetFaceName(hFont, SubstName);
     if (Charset == FXFONT_DEFAULT_CHARSET) {
         m_pFontInfo->GetFontCharset(hFont, Charset);
     }
@@ skipping 409 matching lines @@
         return FALSE;
     }
     CFontFaceInfo* pFont = (CFontFaceInfo*)hFont;
     name = pFont->m_FaceName;
     return TRUE;
 }
 FX_BOOL CFX_FolderFontInfo::GetFontCharset(void* hFont, int& charset)
 {
     return FALSE;
 }