Expand some typedefs to the original types

xfa/fgas/font/fgas_gefont.cpp

Index: xfa/fgas/font/fgas_gefont.cpp
diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp
index 5dfdb70018df2f3ed291358ce0f0a098a2a63505..c877080ec1d592c8d76b4d77d16e4a53a5ee6853 100644
--- a/xfa/fgas/font/fgas_gefont.cpp
+++ b/xfa/fgas/font/fgas_gefont.cpp
@@ -299,24 +299,20 @@ FX_BOOL CFX_GEFont::LoadFont(CFX_Font* pExtFont, FX_BOOL bTakeOver) {
   return bRet;
 }
 FX_BOOL CFX_GEFont::InitFont() {
-  if (!m_pFont) {
+  if (!m_pFont)
     return FALSE;
-  }
   if (!m_pFontEncoding) {
     m_pFontEncoding = FX_CreateFontEncodingEx(m_pFont);
-    if (!m_pFontEncoding) {
+    if (!m_pFontEncoding)
       return FALSE;
-    }
   }
-  if (!m_pCharWidthMap) {
+  if (!m_pCharWidthMap)
     m_pCharWidthMap = new CFX_WordDiscreteArray(1024);
-  }
-  if (!m_pRectArray) {
-    m_pRectArray = new CFX_RectMassArray(16);
-  }
-  if (!m_pBBoxMap) {
+  if (!m_pRectArray)
+    m_pRectArray = new CFX_MassArrayTemplate<CFX_Rect>(16);
+  if (!m_pBBoxMap)
     m_pBBoxMap = new CFX_MapPtrToPtr(16);
-  }
+
   return TRUE;
 }
 IFX_Font* CFX_GEFont::Derive(uint32_t dwFontStyles, uint16_t wCodePage) {