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

core/src/fpdfapi/fpdf_page/fpdf_page_parser.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/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_serial.h"
 #include "pageint.h"
@@ skipping 400 matching lines @@
     return;
   }
   FX_BOOL bDirect = TRUE;
   if (pProperty->GetType() == PDFOBJ_NAME) {
     pProperty = FindResourceObj(FX_BSTRC("Properties"), pProperty->GetString());
     if (pProperty == NULL) {
       return;
     }
     bDirect = FALSE;
   }
-  if (pProperty->GetType() != PDFOBJ_DICTIONARY) {
-    return;
+  if (CPDF_Dictionary* pDict = pProperty->AsDictionary()) {
+    m_CurContentMark.GetModify()->AddMark(tag, pDict, bDirect);
   }
-  m_CurContentMark.GetModify()->AddMark(tag, (CPDF_Dictionary*)pProperty,
-                                        bDirect);
 }
 void CPDF_StreamContentParser::Handle_BeginMarkedContent() {
   if (!m_Options.m_bMarkedContent) {
     return;
   }
   CFX_ByteString tag = GetString(0);
   m_CurContentMark.GetModify()->AddMark(tag, NULL, FALSE);
 }
 struct _FX_BSTR {
   const FX_CHAR* m_Ptr;
@@ skipping 44 matching lines @@
             0) {
       return CFX_ByteStringC(table[i].m_Ptr, table[i].m_Size);
     }
     i += 2;
   }
   return CFX_ByteStringC();
 }
 void _PDF_ReplaceAbbr(CPDF_Object* pObj) {
   switch (pObj->GetType()) {
     case PDFOBJ_DICTIONARY: {
-      CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
+      CPDF_Dictionary* pDict = pObj->AsDictionary();
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key;
         CPDF_Object* value = pDict->GetNextElement(pos, key);
         CFX_ByteStringC fullname = _PDF_FindFullName(
             _PDF_InlineKeyAbbr, sizeof _PDF_InlineKeyAbbr / sizeof(_FX_BSTR),
             key);
         if (!fullname.IsEmpty()) {
           pDict->ReplaceKey(key, fullname);
           key = fullname;
@@ skipping 42 matching lines @@
             0) {
       return CFX_ByteStringC(table[i + 1].m_Ptr, table[i + 1].m_Size);
     }
     i += 2;
   }
   return CFX_ByteStringC();
 }
 void _PDF_ReplaceFull(CPDF_Object* pObj) {
   switch (pObj->GetType()) {
     case PDFOBJ_DICTIONARY: {
-      CPDF_Dictionary* pDict = (CPDF_Dictionary*)pObj;
+      CPDF_Dictionary* pDict = pObj->AsDictionary();
       FX_POSITION pos = pDict->GetStartPos();
       while (pos) {
         CFX_ByteString key;
         CPDF_Object* value = pDict->GetNextElement(pos, key);
         CFX_ByteStringC abbrName = _PDF_FindAbbrName(
             _PDF_InlineKeyAbbr, sizeof(_PDF_InlineKeyAbbr) / sizeof(_FX_BSTR),
             key);
         if (!abbrName.IsEmpty()) {
           pDict->ReplaceKey(key, abbrName);
           key = abbrName;
@@ skipping 315 matching lines @@
   m_pCurStates->m_ColorState.SetFillColor(pCS, &value, 1);
 }
 void CPDF_StreamContentParser::Handle_SetGray_Stroke() {
   FX_FLOAT value = GetNumber(0);
   CPDF_ColorSpace* pCS = CPDF_ColorSpace::GetStockCS(PDFCS_DEVICEGRAY);
   m_pCurStates->m_ColorState.SetStrokeColor(pCS, &value, 1);
 }
 void CPDF_StreamContentParser::Handle_SetExtendGraphState() {
   CFX_ByteString name = GetString(0);
   CPDF_Dictionary* pGS =
-      (CPDF_Dictionary*)FindResourceObj(FX_BSTRC("ExtGState"), name);
-  if (pGS == NULL || pGS->GetType() != PDFOBJ_DICTIONARY) {
+      ToDictionary(FindResourceObj(FX_BSTRC("ExtGState"), name));
+  if (!pGS) {
     m_bResourceMissing = TRUE;
     return;
   }
   m_pCurStates->ProcessExtGS(pGS, this);
 }
 void CPDF_StreamContentParser::Handle_ClosePath() {
   if (m_Options.m_bTextOnly) {
     return;
   }
   if (m_PathPointCount == 0) {
@@ skipping 309 matching lines @@
       return NULL;
     }
     CPDF_Object* pRes = pList->GetElementValue(name);
     return pRes;
   }
   CPDF_Object* pRes = pList->GetElementValue(name);
   return pRes;
 }
 CPDF_Font* CPDF_StreamContentParser::FindFont(const CFX_ByteString& name) {
   CPDF_Dictionary* pFontDict =
-      (CPDF_Dictionary*)FindResourceObj(FX_BSTRC("Font"), name);
-  if (pFontDict == NULL || pFontDict->GetType() != PDFOBJ_DICTIONARY) {
+      ToDictionary(FindResourceObj(FX_BSTRC("Font"), name));
+  if (!pFontDict) {
     m_bResourceMissing = TRUE;
     return CPDF_Font::GetStockFont(m_pDocument, FX_BSTRC("Helvetica"));
   }
+
   CPDF_Font* pFont = m_pDocument->LoadFont(pFontDict);
   if (pFont && pFont->GetType3Font()) {
     pFont->GetType3Font()->SetPageResources(m_pResources);
     pFont->GetType3Font()->CheckType3FontMetrics();
   }
   return pFont;
 }
 CPDF_ColorSpace* CPDF_StreamContentParser::FindColorSpace(
     const CFX_ByteString& name) {
   if (name == FX_BSTRC("Pattern")) {
@@ skipping 19 matching lines @@
   if (pCSObj == NULL) {
     m_bResourceMissing = TRUE;
     return NULL;
   }
   return m_pDocument->LoadColorSpace(pCSObj);
 }
 CPDF_Pattern* CPDF_StreamContentParser::FindPattern(const CFX_ByteString& name,
                                                     FX_BOOL bShading) {
   CPDF_Object* pPattern = FindResourceObj(
       bShading ? FX_BSTRC("Shading") : FX_BSTRC("Pattern"), name);
-  if (pPattern == NULL || (pPattern->GetType() != PDFOBJ_DICTIONARY &&
-                           pPattern->GetType() != PDFOBJ_STREAM)) {
+  if (pPattern == NULL ||
+      (!pPattern->IsDictionary() && pPattern->GetType() != PDFOBJ_STREAM)) {
     m_bResourceMissing = TRUE;
     return NULL;
   }
   return m_pDocument->LoadPattern(pPattern, bShading,
                                   &m_pCurStates->m_ParentMatrix);
 }
 void CPDF_StreamContentParser::ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y) {
   m_pCurStates->m_TextMatrix.Transform(x, y, x, y);
   ConvertUserSpace(x, y);
 }
@@ skipping 311 matching lines @@
         buf.AppendChar((char)code);
       }
       bFirst = !bFirst;
     }
   }
   if (!bFirst) {
     buf.AppendChar((char)code);
   }
   return buf.GetByteString();
 }