[Merge to XFA] Revert "Revert "Add type cast definitions for CPDF_Dictionary.""

core/src/fpdfdoc/doc_action.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/fpdfdoc/fpdf_doc.h"
 CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const {
   if (!m_pDict) {
     return CPDF_Dest();
@@ skipping 233 matching lines @@
   if (iObjType == PDFOBJ_ARRAY) {
     return ((CPDF_Array*)pNext)->GetCount();
   }
   return 0;
 }
 CPDF_Action CPDF_Action::GetSubAction(FX_DWORD iIndex) const {
   if (m_pDict == NULL || !m_pDict->KeyExist("Next")) {
     return CPDF_Action();
   }
   CPDF_Object* pNext = m_pDict->GetElementValue("Next");
-  int iObjType = pNext->GetType();
-  if (iObjType == PDFOBJ_DICTIONARY) {
-    CPDF_Dictionary* pDict = static_cast<CPDF_Dictionary*>(pNext);
-    if (iIndex == 0) {
+  if (CPDF_Dictionary* pDict = ToDictionary(pNext)) {
+    if (iIndex == 0)
       return CPDF_Action(pDict);
-    }
-  } else if (iObjType == PDFOBJ_ARRAY) {
+  } else if (pNext->GetType() == PDFOBJ_ARRAY) {
     CPDF_Array* pArray = static_cast<CPDF_Array*>(pNext);
     return CPDF_Action(pArray->GetDict(iIndex));
   }
   return CPDF_Action();
 }
 const FX_CHAR* g_sAATypes[] = {"E",  "X",  "D",  "U",  "Fo", "Bl", "PO", "PC",
                                "PV", "PI", "O",  "C",  "K",  "F",  "V",  "C",
                                "WC", "WS", "DS", "WP", "DP", ""};
 FX_BOOL CPDF_AAction::ActionExist(AActionType eType) const {
   if (m_pDict == NULL) {
@@ skipping 17 matching lines @@
                                         AActionType& eType) const {
   if (m_pDict == NULL) {
     return CPDF_Action();
   }
   CFX_ByteString csKey;
   CPDF_Object* pObj = m_pDict->GetNextElement(pos, csKey);
   if (!pObj) {
     return CPDF_Action();
   }
   CPDF_Object* pDirect = pObj->GetDirect();
-  if (!pDirect || pDirect->GetType() != PDFOBJ_DICTIONARY) {
+  CPDF_Dictionary* pDict = ToDictionary(pDirect);
+  if (!pDict)
     return CPDF_Action();
-  }
+
   int i = 0;
   while (g_sAATypes[i][0] != '\0') {
     if (csKey == g_sAATypes[i]) {
       break;
     }
     i++;
   }
   eType = (AActionType)i;
-  return CPDF_Action(static_cast<CPDF_Dictionary*>(pDirect));
+  return CPDF_Action(pDict);
 }
 CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) {
   m_pDocument = pDoc;
 }
 int CPDF_DocJSActions::CountJSActions() const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   return name_tree.GetCount();
 }
 CPDF_Action CPDF_DocJSActions::GetJSAction(int index,
                                            CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   CPDF_Object* pAction = name_tree.LookupValue(index, csName);
-  if (pAction == NULL || pAction->GetType() != PDFOBJ_DICTIONARY) {
+  if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 CPDF_Action CPDF_DocJSActions::GetJSAction(const CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   CPDF_Object* pAction = name_tree.LookupValue(csName);
-  if (pAction == NULL || pAction->GetType() != PDFOBJ_DICTIONARY) {
+  if (!ToDictionary(pAction)) {
     return CPDF_Action();
   }
   return CPDF_Action(pAction->GetDict());
 }
 int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const {
   ASSERT(m_pDocument != NULL);
   CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
   return name_tree.GetIndex(csName);
 }