Re-land else-after-returns

fpdfsdk/src/fsdk_mgr.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 "../../public/fpdf_ext.h"
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
@@ skipping 123 matching lines @@
 }
 
 CFX_ByteString CFX_SystemHandler::GetNativeTrueTypeFont(int32_t nCharset)
 {
     return "";
 }
 
 FX_BOOL CFX_SystemHandler::FindNativeTrueTypeFont(int32_t nCharset, CFX_ByteString sFontFaceName)
 {
     CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr();
-//  FXFT_Face nFace = pFontMgr->FindSubstFont(sFontFaceName,TRUE,0,0,0,0,NULL);
-//  FXFT_Face nFace  = pFontMgr->m_pBuiltinMapper->FindSubstFont(sFontFaceName,TRUE,0,0,0,0,NULL);
-
     if(pFontMgr)
     {
         CFX_FontMapper* pFontMapper = pFontMgr->m_pBuiltinMapper;
         if(pFontMapper)
         {
             int nSize = pFontMapper->m_InstalledTTFonts.GetSize();
             if(nSize ==0)
             {
                 pFontMapper->LoadInstalledFonts();
                 nSize = pFontMapper->m_InstalledTTFonts.GetSize();
             }
 
             for(int i=0; i<nSize; i++)
             {
                 if(pFontMapper->m_InstalledTTFonts[i].Compare(sFontFaceName))
                     return TRUE;
             }
         }
 
     }
 
     return FALSE;
-//  pFontMgr->m_FaceMap.Lookup(sFontFaceName,pFont);
-//  return (pFont!=NULL);
 }
 
 static int CharSet2CP(int charset)
 {
-    if(charset == 128)
+    if (charset == 128)
         return 932;
-    else if(charset == 134)
+    if (charset == 134)
         return 936;
-    else if(charset == 129)
+    if (charset == 129)
         return 949;
-    else if(charset == 136)
+    if (charset == 136)
         return 950;
     return 0;
 }
 CPDF_Font* CFX_SystemHandler::AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc, CFX_ByteString sFontFaceName,
                                                          uint8_t nCharset)
 {
     if(pDoc)
     {
         CFX_Font* pFXFont = new CFX_Font();
         pFXFont->LoadSubst(sFontFaceName,TRUE,0,0,0,CharSet2CP(nCharset),FALSE);
@@ skipping 739 matching lines @@
         m_bOnWidget = TRUE;
         if(!m_bEnterWidget)
         {
             m_bEnterWidget = TRUE;
             m_bExitWidget = FALSE;
             pAnnotHandlerMgr->Annot_OnMouseEnter(this, pFXAnnot,nFlag);
         }
         pAnnotHandlerMgr->Annot_OnMouseMove(this, pFXAnnot, nFlag, point);
         return TRUE;
     }
-    else
+    if(m_bOnWidget)
     {
-        if(m_bOnWidget)
+        m_bOnWidget = FALSE;
+        m_bExitWidget = TRUE;
+        m_bEnterWidget = FALSE;
+        if(m_CaptureWidget)
         {
-            m_bOnWidget = FALSE;
-            m_bExitWidget = TRUE;
-            m_bEnterWidget = FALSE;
-            if(m_CaptureWidget)
-            {
-                pAnnotHandlerMgr->Annot_OnMouseExit(this, m_CaptureWidget, nFlag);
-                m_CaptureWidget = NULL;
-            }
+            pAnnotHandlerMgr->Annot_OnMouseExit(this, m_CaptureWidget, nFlag);
+            m_CaptureWidget = NULL;
         }
-        return FALSE;
     }
-
-    return FALSE;;
+    return FALSE;
 }
 
 FX_BOOL CPDFSDK_PageView::OnMouseWheel(double deltaX, double deltaY,const CPDF_Point& point, int nFlag)
 {
     if(CPDFSDK_Annot* pAnnot = GetFXWidgetAtPoint(point.x, point.y))
     {
         CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
         CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr();
         ASSERT(pAnnotHandlerMgr);
         return pAnnotHandlerMgr->Annot_OnMouseWheel(this, pAnnot, nFlag, (int)deltaY, point);
@@ skipping 126 matching lines @@
         return NULL;
 
     for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
     {
         CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
         if(pAnnot == pFocusAnnot)
             return pAnnot;
     }
     return NULL;
 }