Merge to XFA - else after returns.

core/src/fxge/ge/fx_ge_font.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/fxge/fx_ge.h"
 #include "../../../include/fxge/fx_freetype.h"
 #include "text_int.h"
 #define EM_ADJUST(em, a) (em == 0?(a): (a)*1000/em)
@@ skipping 327 matching lines @@
     }
     return psName;
 }
 CFX_ByteString CFX_Font::GetFamilyName() const
 {
     if (m_Face == NULL && m_pSubstFont == NULL) {
         return CFX_ByteString();
     }
     if (m_Face) {
         return CFX_ByteString(FXFT_Get_Face_Family_Name(m_Face));
-    } else {
-        return m_pSubstFont->m_Family;
     }
+    return m_pSubstFont->m_Family;
 }
 CFX_ByteString CFX_Font::GetFaceName() const
 {
     if (m_Face == NULL && m_pSubstFont == NULL) {
         return CFX_ByteString();
     }
     if (m_Face) {
         CFX_ByteString facename;
         CFX_ByteString style = CFX_ByteString(FXFT_Get_Face_Style_Name(m_Face));
         facename = GetFamilyName();
         if (facename.IsEmpty()) {
             facename = "Untitled";
         }
         if (!style.IsEmpty() && style != "Regular") {
             facename += " " + style;
         }
         return facename;
-    } else {
-        return m_pSubstFont->m_Family;
     }
+    return m_pSubstFont->m_Family;
 }
 FX_BOOL CFX_Font::GetBBox(FX_RECT &bbox)
 {
     if (m_Face == NULL) {
         return FALSE;
     }
     int em = FXFT_Get_Face_UnitsPerEM(m_Face);
     if (em == 0) {
         bbox.left = FXFT_Get_Face_xMin(m_Face);
         bbox.bottom = FXFT_Get_Face_yMax(m_Face);
@@ skipping 58 matching lines @@
             index = FXFT_Get_Char_Index(face, charcode);
         }
         if (!index && !FXFT_Select_Charmap(face, FXFT_ENCODING_APPLE_ROMAN)) {
             return FXFT_Get_Char_Index(face, charcode);
         }
     }
     return charcode;
 }
 FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCodeEx(FX_DWORD charcode, int encoding)
 {
-    FXFT_Face face =  m_pFont->GetFace();
+    FXFT_Face face = m_pFont->GetFace();
     if (!face) {
         return charcode;
     }
     if (encoding == ENCODING_UNICODE) {
-        return  GlyphFromCharCode(charcode);
-    } else {
-        int nmaps = FXFT_Get_Face_CharmapCount(m_pFont->m_Face);
-        int i = 0;
-        while (i < nmaps) {
-            int encoding = FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[i++]);
-            if (encoding != FXFT_ENCODING_UNICODE) {
-                FXFT_Select_Charmap(face, encoding);
-                break;
-            }
+        return GlyphFromCharCode(charcode);
+    }
+    int nmaps = FXFT_Get_Face_CharmapCount(m_pFont->m_Face);
+    int i = 0;
+    while (i < nmaps) {
+        int encoding = FXFT_Get_Charmap_Encoding(FXFT_Get_Face_Charmaps(face)[i++]);
+        if (encoding != FXFT_ENCODING_UNICODE) {
+            FXFT_Select_Charmap(face, encoding);
+            break;
         }
     }
     return FXFT_Get_Char_Index(face, charcode);
 }
 IFX_FontEncoding* FXGE_CreateUnicodeEncoding(CFX_Font* pFont)
 {
     CFX_UnicodeEncoding* pEncoding = NULL;
     pEncoding = FX_NEW CFX_UnicodeEncoding(pFont);
     return pEncoding;
 }
@@ skipping 155 matching lines @@
     }
     static int s_count = sizeof(gs_EncodingID) / sizeof(FX_DWORD);
     for (int i = 0; i < s_count; i++) {
         IFX_FontEncodingEx* pFontEncoding = _FXFM_CreateFontEncoding(pFont, gs_EncodingID[i]);
         if (pFontEncoding) {
             return pFontEncoding;
         }
     }
     return NULL;
 }