From 4eb4d7f6c707cc2c23c806aa540d055c8832b55d Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 22 Jul 2015 15:04:26 -0700
Subject: Revert "Fix else-after-returns throughout pdfium."

This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
---
 fpdfsdk/src/fsdk_mgr.cpp | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'fpdfsdk/src/fsdk_mgr.cpp')

diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 05c1a3dd89..e54202a3e4 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -141,6 +141,9 @@ CFX_ByteString CFX_SystemHandler::GetNativeTrueTypeFont(int32_t nCharset)
 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;
@@ -163,17 +166,19 @@ FX_BOOL CFX_SystemHandler::FindNativeTrueTypeFont(int32_t nCharset, CFX_ByteStri
     }
 
     return FALSE;
+//  pFontMgr->m_FaceMap.Lookup(sFontFaceName,pFont);
+//  return (pFont!=NULL);
 }
 
 static int CharSet2CP(int charset)
 {
-    if (charset == 128)
+    if(charset == 128)
         return 932;
-    if (charset == 134)
+    else if(charset == 134)
         return 936;
-    if (charset == 129)
+    else if(charset == 129)
         return 949;
-    if (charset == 136)
+    else if(charset == 136)
         return 950;
     return 0;
 }
@@ -933,18 +938,23 @@ FX_BOOL CPDFSDK_PageView::OnMouseMove(const CPDF_Point & point, int nFlag)
         pAnnotHandlerMgr->Annot_OnMouseMove(this, pFXAnnot, nFlag, point);
         return TRUE;
     }
-    if(m_bOnWidget)
+    else
     {
-        m_bOnWidget = FALSE;
-        m_bExitWidget = TRUE;
-        m_bEnterWidget = FALSE;
-        if(m_CaptureWidget)
+        if(m_bOnWidget)
         {
-            pAnnotHandlerMgr->Annot_OnMouseExit(this, m_CaptureWidget, nFlag);
-            m_CaptureWidget = NULL;
+            m_bOnWidget = FALSE;
+            m_bExitWidget = TRUE;
+            m_bEnterWidget = FALSE;
+            if(m_CaptureWidget)
+            {
+                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)
-- 
cgit v1.2.3