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

core/src/fpdfdoc/doc_annot.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 "../../../third_party/base/nonstd_unique_ptr.h"
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 
 CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) {
   ASSERT(pPage != NULL);
   m_pPageDict = pPage->m_pFormDict;
   if (m_pPageDict == NULL) {
     return;
   }
   m_pDocument = pPage->m_pDocument;
   CPDF_Array* pAnnots = m_pPageDict->GetArray("Annots");
   if (pAnnots == NULL) {
     return;
   }
   CPDF_Dictionary* pRoot = m_pDocument->GetRoot();
   CPDF_Dictionary* pAcroForm = pRoot->GetDict("AcroForm");
   FX_BOOL bRegenerateAP = pAcroForm && pAcroForm->GetBoolean("NeedAppearances");
   for (FX_DWORD i = 0; i < pAnnots->GetCount(); ++i) {
-    CPDF_Dictionary* pDict = (CPDF_Dictionary*)pAnnots->GetElementValue(i);
-    if (pDict == NULL || pDict->GetType() != PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pDict = ToDictionary(pAnnots->GetElementValue(i));
+    if (!pDict) {
       continue;
     }
     FX_DWORD dwObjNum = pDict->GetObjNum();
     if (dwObjNum == 0) {
       dwObjNum = m_pDocument->AddIndirectObject(pDict);
       CPDF_Reference* pAction = CPDF_Reference::Create(m_pDocument, dwObjNum);
       if (pAction == NULL) {
         break;
       }
       pAnnots->InsertAt(i, pAction);
@@ skipping 160 matching lines @@
   if (!pAP->KeyExist(ap_entry)) {
     ap_entry = "N";
   }
   CPDF_Object* psub = pAP->GetElementValue(ap_entry);
   if (psub == NULL) {
     return NULL;
   }
   CPDF_Stream* pStream = NULL;
   if (psub->GetType() == PDFOBJ_STREAM) {
     pStream = (CPDF_Stream*)psub;
-  } else if (psub->GetType() == PDFOBJ_DICTIONARY) {
+  } else if (CPDF_Dictionary* pDict = psub->AsDictionary()) {
     CFX_ByteString as = pAnnotDict->GetString("AS");
     if (as.IsEmpty()) {
       CFX_ByteString value = pAnnotDict->GetString(FX_BSTRC("V"));
       if (value.IsEmpty()) {
         CPDF_Dictionary* pDict = pAnnotDict->GetDict(FX_BSTRC("Parent"));
         value = pDict ? pDict->GetString(FX_BSTRC("V")) : CFX_ByteString();
       }
-      if (value.IsEmpty() || !((CPDF_Dictionary*)psub)->KeyExist(value)) {
+      if (value.IsEmpty() || !pDict->KeyExist(value)) {
         as = FX_BSTRC("Off");
       } else {
         as = value;
       }
     }
-    pStream = ((CPDF_Dictionary*)psub)->GetStream(as);
+    pStream = pDict->GetStream(as);
   }
   return pStream;
 }
 CPDF_Form* CPDF_Annot::GetAPForm(const CPDF_Page* pPage, AppearanceMode mode) {
   CPDF_Stream* pStream = FPDFDOC_GetAnnotAP(m_pAnnotDict, mode);
   if (pStream == NULL) {
     return NULL;
   }
   CPDF_Form* pForm;
   if (m_APMap.Lookup(pStream, (void*&)pForm)) {
@@ skipping 144 matching lines @@
   CPDF_PathData path;
   width /= 2;
   path.AppendRect(rect.left + width, rect.bottom + width, rect.right - width,
                   rect.top - width);
   int fill_type = 0;
   if (pOptions && (pOptions->m_Flags & RENDER_NOPATHSMOOTH)) {
     fill_type |= FXFILL_NOPATHSMOOTH;
   }
   pDevice->DrawPath(&path, pUser2Device, &graph_state, argb, argb, fill_type);
 }