From 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 22 Jul 2015 15:14:14 -0700
Subject: Re-land else-after-returns

Revert "Revert "Fix else-after-returns throughout pdfium.""
This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d.

Fix one naming conflict.

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1243953004 .
---
 core/src/fxge/ge/fx_ge_font.cpp | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'core/src/fxge/ge/fx_ge_font.cpp')

diff --git a/core/src/fxge/ge/fx_ge_font.cpp b/core/src/fxge/ge/fx_ge_font.cpp
index f88cbaacde..6a950bf20b 100644
--- a/core/src/fxge/ge/fx_ge_font.cpp
+++ b/core/src/fxge/ge/fx_ge_font.cpp
@@ -309,9 +309,8 @@ CFX_ByteString CFX_Font::GetFamilyName() const
     }
     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
 {
@@ -329,9 +328,8 @@ CFX_ByteString CFX_Font::GetFaceName() const
             facename += " " + style;
         }
         return facename;
-    } else {
-        return m_pSubstFont->m_Family;
     }
+    return m_pSubstFont->m_Family;
 }
 FX_BOOL CFX_Font::GetBBox(FX_RECT &bbox)
 {
@@ -410,21 +408,20 @@ FX_DWORD CFX_UnicodeEncoding::GlyphFromCharCode(FX_DWORD 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);
-- 
cgit v1.2.3