Re-land else-after-returns

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

Committed: https://pdfium.googlesource.com/pdfium/+/3c012fef2bb72c8ec1faa73e11ee35539b2559d6

[Tom Sepez, 2015-07-22 22:14:19]

Committed patchset #1 (id:1) manually as
3c012fef2bb72c8ec1faa73e11ee35539b2559d6 (presubmit successful).

[Lei Zhang, 2015-07-22 22:16:44]

Not obvious what changed.

[Tom Sepez, 2015-07-22 22:18:41]

On 2015/07/22 22:16:44, Lei Zhang wrote:
> Not obvious what changed.
Sorry, 

diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp
index 233ed94..59a4cfb 100644
--- a/core/src/fxge/ge/fx_ge_text.cpp
+++ b/core/src/fxge/ge/fx_ge_text.cpp
@@ -1182,9 +1182,9 @@ const CFX_GlyphBitmap*
CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont, FX_DWORD
     else
         keygen.Generate(6, (int)(pMatrix->a * 10000), (int)(pMatrix->b *
10000),
                         (int)(pMatrix->c * 10000), (int)(pMatrix->d * 10000),
dest_width, anti_alias);
-    CFX_ByteStringC FaceGlyphsKey(keygen.m_Key, keygen.m_KeyLen);
+    CFX_ByteStringC FaceGlyphsKey2(keygen.m_Key, keygen.m_KeyLen);
     text_flags |= FXTEXT_NO_NATIVETEXT;
-    return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey, glyph_index,
bFontStyle, dest_width, anti_alias);
+    return LookUpGlyphBitmap(pFont, pMatrix, FaceGlyphsKey2, glyph_index,
bFontStyle, dest_width, anti_alias);
 #endif
 }
 CFX_SizeGlyphCache::~CFX_SizeGlyphCache()

Moving this one level outwards created a conflict of a shadowed inner variable.

[Lei Zhang, 2015-07-22 22:21:35]

lgtm