Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

fpdfsdk/src/formfiller/FFL_CBA_Fontmap.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 "../../include/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
 
 CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot,
@@ skipping 119 matching lines @@
   CPDF_Font* pFind = NULL;
 
   FX_POSITION pos = pFonts->GetStartPos();
   while (pos) {
     CPDF_Object* pObj = NULL;
     CFX_ByteString csKey;
     pObj = pFonts->GetNextElement(pos, csKey);
     if (pObj == NULL)
       continue;
 
-    CPDF_Object* pDirect = pObj->GetDirect();
-    if (pDirect == NULL || pDirect->GetType() != PDFOBJ_DICTIONARY)
+    CPDF_Dictionary* pElement = ToDictionary(pObj->GetDirect());
+    if (!pElement)
       continue;
-
-    CPDF_Dictionary* pElement = (CPDF_Dictionary*)pDirect;
     if (pElement->GetString("Type") != "Font")
       continue;
 
     CPDF_Font* pFont = pDocument->LoadFont(pElement);
     if (pFont == NULL)
       continue;
     const CFX_SubstFont* pSubst = pFont->GetSubstFont();
     if (pSubst == NULL)
       continue;
     if (pSubst->m_Charset == nCharset) {
@@ skipping 19 matching lines @@
 
   CPDF_Dictionary* pAPDict = m_pAnnotDict->GetDict("AP");
 
   if (pAPDict == NULL) {
     pAPDict = new CPDF_Dictionary;
     m_pAnnotDict->SetAt("AP", pAPDict);
   }
 
   // to avoid checkbox and radiobutton
   CPDF_Object* pObject = pAPDict->GetElement(m_sAPType);
-  if (pObject && pObject->GetType() == PDFOBJ_DICTIONARY)
+  if (ToDictionary(pObject))
     return;
 
   CPDF_Stream* pStream = pAPDict->GetStream(m_sAPType);
   if (pStream == NULL) {
     pStream = new CPDF_Stream(NULL, 0, NULL);
     int32_t objnum = m_pDocument->AddIndirectObject(pStream);
     pAPDict->SetAtReference(m_sAPType, m_pDocument, objnum);
   }
 
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
@@ skipping 82 matching lines @@
 
   return pFontDict ? m_pDocument->LoadFont(pFontDict) : nullptr;
 }
 
 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType) {
   m_sAPType = sAPType;
 
   Reset();
   Initial();
 }