Revert "Add type cast definitions for CPDF_Dictionary."

This reverts commit 4816432671eef6467354aa252f22bb80acc315b7.

Reason, broke the javascript_test Rendering PDF file
/mnt/data/b/build/slave/linux/build/pdfium/out/Debug/gen/pdfium/testing/javascript/document_methods.pdf.
Non-linearized path...
FAILURE: document_methods.in; Command
'['/mnt/data/b/build/slave/linux/build/pdfium/out/Debug/pdfium_test',
'/mnt/data/b/build/slave/linux/build/pdfium/out/Debug/gen/pdfium/testing/javascript/document_methods.pdf']'
returned non-zero exit status -11

BUG=pdfium:201
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1412413002 .

6 files changed, 56 insertions, 58 deletions

diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
index 55c62e2878..2d6e9f3436 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
@@ -283,7 +283,7 @@ ICodec_ScanlineDecoder* FPDFAPI_CreateFlateDecoder(
   int predictor = 0;
   int Colors = 0, BitsPerComponent = 0, Columns = 0;
   if (pParams) {
-    predictor = pParams->GetInteger(FX_BSTRC("Predictor"));
+    predictor = ((CPDF_Dictionary*)pParams)->GetInteger(FX_BSTRC("Predictor"));
     Colors = pParams->GetInteger(FX_BSTRC("Colors"), 1);
     BitsPerComponent = pParams->GetInteger(FX_BSTRC("BitsPerComponent"), 8);
     Columns = pParams->GetInteger(FX_BSTRC("Columns"), 1);
@@ -306,8 +306,9 @@ FX_DWORD FPDFAPI_FlateOrLZWDecode(FX_BOOL bLZW,
   FX_BOOL bEarlyChange = TRUE;
   int Colors = 0, BitsPerComponent = 0, Columns = 0;
   if (pParams) {
-    predictor = pParams->GetInteger(FX_BSTRC("Predictor"));
-    bEarlyChange = pParams->GetInteger(FX_BSTRC("EarlyChange"), 1);
+    predictor = ((CPDF_Dictionary*)pParams)->GetInteger(FX_BSTRC("Predictor"));
+    bEarlyChange =
+        ((CPDF_Dictionary*)pParams)->GetInteger(FX_BSTRC("EarlyChange"), 1);
     Colors = pParams->GetInteger(FX_BSTRC("Colors"), 1);
     BitsPerComponent = pParams->GetInteger(FX_BSTRC("BitsPerComponent"), 8);
     Columns = pParams->GetInteger(FX_BSTRC("Columns"), 1);
@@ -364,9 +365,7 @@ FX_BOOL PDF_DataDecode(const uint8_t* src_buf,
     int estimated_size =
         i == DecoderList.GetSize() - 1 ? last_estimated_size : 0;
     CFX_ByteString decoder = DecoderList[i];
-    // Use ToDictionary here because we can push NULL into the ParamList.
-    CPDF_Dictionary* pParam =
-        ToDictionary(static_cast<CPDF_Object*>(ParamList[i]));
+    CPDF_Dictionary* pParam = (CPDF_Dictionary*)ParamList[i];
     uint8_t* new_buf = NULL;
     FX_DWORD new_size = (FX_DWORD)-1;
     int offset = -1;
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
index 29c1a007cf..2dff766187 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp
@@ -143,15 +143,18 @@ CPDF_Dictionary* CPDF_Document::GetPage(int iPage) {
     return nullptr;
 
   if (m_bLinearized && (iPage == (int)m_dwFirstPageNo)) {
-    if (CPDF_Dictionary* pDict =
-            ToDictionary(GetIndirectObject(m_dwFirstPageObjNum)))
-      return pDict;
+    CPDF_Object* pObj = GetIndirectObject(m_dwFirstPageObjNum);
+    if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) {
+      return static_cast<CPDF_Dictionary*>(pObj);
+    }
   }
 
   int objnum = m_PageList.GetAt(iPage);
   if (objnum) {
-    if (CPDF_Dictionary* pDict = ToDictionary(GetIndirectObject(objnum)))
-      return pDict;
+    CPDF_Object* pObj = GetIndirectObject(objnum);
+    if (pObj && pObj->GetType() == PDFOBJ_DICTIONARY) {
+      return static_cast<CPDF_Dictionary*>(pObj);
+    }
   }
 
   CPDF_Dictionary* pRoot = GetRoot();
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp
index 82bfbb56eb..19359ad7cf 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp
@@ -70,11 +70,13 @@ void CFDF_Document::ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
       if (word != FX_BSTRC("trailer")) {
         break;
       }
-      if (CPDF_Dictionary* pMainDict =
-              ToDictionary(parser.GetObject(this, 0, 0, 0))) {
-        m_pRootDict = pMainDict->GetDict(FX_BSTRC("Root"));
-        pMainDict->Release();
+      CPDF_Dictionary* pMainDict =
+          (CPDF_Dictionary*)parser.GetObject(this, 0, 0, 0);
+      if (pMainDict == NULL || pMainDict->GetType() != PDFOBJ_DICTIONARY) {
+        break;
       }
+      m_pRootDict = pMainDict->GetDict(FX_BSTRC("Root"));
+      pMainDict->Release();
       break;
     }
   }
@@ -140,17 +142,18 @@ void FPDF_FileSpec_SetWin32Path(CPDF_Object* pFileSpec,
   }
   if (pFileSpec->GetType() == PDFOBJ_STRING) {
     pFileSpec->SetString(CFX_ByteString::FromUnicode(result));
-  } else if (CPDF_Dictionary* pFileDict = pFileSpec->AsDictionary()) {
-    pFileDict->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(result));
-    pFileDict->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(result));
-    pFileDict->RemoveAt(FX_BSTRC("FS"));
+  } else if (pFileSpec->GetType() == PDFOBJ_DICTIONARY) {
+    ((CPDF_Dictionary*)pFileSpec)
+        ->SetAtString(FX_BSTRC("F"), CFX_ByteString::FromUnicode(result));
+    ((CPDF_Dictionary*)pFileSpec)
+        ->SetAtString(FX_BSTRC("UF"), PDF_EncodeText(result));
+    ((CPDF_Dictionary*)pFileSpec)->RemoveAt(FX_BSTRC("FS"));
   }
 }
 CFX_WideString FPDF_FileSpec_GetWin32Path(const CPDF_Object* pFileSpec) {
   CFX_WideString wsFileName;
-  if (!pFileSpec) {
-    wsFileName = CFX_WideString();
-  } else if (const CPDF_Dictionary* pDict = pFileSpec->AsDictionary()) {
+  if (pFileSpec->GetType() == PDFOBJ_DICTIONARY) {
+    CPDF_Dictionary* pDict = (CPDF_Dictionary*)pFileSpec;
     wsFileName = pDict->GetUnicodeText(FX_BSTRC("UF"));
     if (wsFileName.IsEmpty()) {
       wsFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("F")));
@@ -161,7 +164,9 @@ CFX_WideString FPDF_FileSpec_GetWin32Path(const CPDF_Object* pFileSpec) {
     if (wsFileName.IsEmpty() && pDict->KeyExist(FX_BSTRC("DOS"))) {
       wsFileName = CFX_WideString::FromLocal(pDict->GetString(FX_BSTRC("DOS")));
     }
-  } else {
+  } else if (!pFileSpec)
+    wsFileName = CFX_WideString();
+  else {
     wsFileName = CFX_WideString::FromLocal(pFileSpec->GetString());
   }
   if (wsFileName[0] != '/') {
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
index 317f96d1dc..e1e821c4c5 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
@@ -28,7 +28,7 @@ void CPDF_Object::Destroy() {
       delete (CPDF_Array*)this;
       break;
     case PDFOBJ_DICTIONARY:
-      delete this->AsDictionary();
+      delete (CPDF_Dictionary*)this;
       break;
     case PDFOBJ_STREAM:
       delete (CPDF_Stream*)this;
@@ -138,9 +138,7 @@ int CPDF_Object::GetInteger() const {
 CPDF_Dictionary* CPDF_Object::GetDict() const {
   switch (m_Type) {
     case PDFOBJ_DICTIONARY:
-      // The method should be made non-const if we want to not be const.
-      // See bug #234.
-      return const_cast<CPDF_Dictionary*>(this->AsDictionary());
+      return (CPDF_Dictionary*)this;
     case PDFOBJ_STREAM:
       return ((CPDF_Stream*)this)->GetDict();
     case PDFOBJ_REFERENCE: {
@@ -217,7 +215,7 @@ FX_BOOL CPDF_Object::IsIdentical(CPDF_Object* pOther) const {
     case PDFOBJ_ARRAY:
       return (((CPDF_Array*)this)->Identical((CPDF_Array*)pOther));
     case PDFOBJ_DICTIONARY:
-      return this->AsDictionary()->Identical(pOther->AsDictionary());
+      return (((CPDF_Dictionary*)this)->Identical((CPDF_Dictionary*)pOther));
     case PDFOBJ_NULL:
       return TRUE;
     case PDFOBJ_STREAM:
@@ -266,7 +264,7 @@ CPDF_Object* CPDF_Object::CloneInternal(FX_BOOL bDirect,
     }
     case PDFOBJ_DICTIONARY: {
       CPDF_Dictionary* pCopy = new CPDF_Dictionary();
-      const CPDF_Dictionary* pThis = this->AsDictionary();
+      CPDF_Dictionary* pThis = (CPDF_Dictionary*)this;
       FX_POSITION pos = pThis->m_Map.GetStartPosition();
       while (pos) {
         CFX_ByteString key;
@@ -285,9 +283,9 @@ CPDF_Object* CPDF_Object::CloneInternal(FX_BOOL bDirect,
       acc.LoadAllData(pThis, TRUE);
       FX_DWORD streamSize = acc.GetSize();
       CPDF_Dictionary* pDict = pThis->GetDict();
-      if (pDict) {
-        pDict = pDict->CloneInternal(bDirect, visited)->AsDictionary();
-      }
+      if (pDict)
+        pDict = (CPDF_Dictionary*)((CPDF_Object*)pDict)
+                    ->CloneInternal(bDirect, visited);
       return new CPDF_Stream(acc.DetachData(), streamSize, pDict);
     }
     case PDFOBJ_REFERENCE: {
@@ -337,14 +335,6 @@ void CPDF_Object::SetUnicodeText(const FX_WCHAR* pUnicodes, int len) {
   }
 }
 
-CPDF_Dictionary* CPDF_Object::AsDictionary() {
-  return IsDictionary() ? static_cast<CPDF_Dictionary*>(this) : nullptr;
-}
-
-const CPDF_Dictionary* CPDF_Object::AsDictionary() const {
-  return IsDictionary() ? static_cast<const CPDF_Dictionary*>(this) : nullptr;
-}
-
 CPDF_Number::CPDF_Number(int value)
     : CPDF_Object(PDFOBJ_NUMBER), m_bInteger(TRUE), m_Integer(value) {}
 
@@ -452,8 +442,8 @@ CPDF_Dictionary* CPDF_Array::GetDict(FX_DWORD i) const {
   if (!p) {
     return NULL;
   }
-  if (CPDF_Dictionary* pDict = p->AsDictionary()) {
-    return pDict;
+  if (p->GetType() == PDFOBJ_DICTIONARY) {
+    return (CPDF_Dictionary*)p;
   }
   if (p->GetType() == PDFOBJ_STREAM) {
     return ((CPDF_Stream*)p)->GetDict();
@@ -673,8 +663,8 @@ CPDF_Dictionary* CPDF_Dictionary::GetDict(const CFX_ByteStringC& key) const {
   if (!p) {
     return nullptr;
   }
-  if (CPDF_Dictionary* pDict = p->AsDictionary()) {
-    return pDict;
+  if (p->GetType() == PDFOBJ_DICTIONARY) {
+    return (CPDF_Dictionary*)p;
   }
   if (p->GetType() == PDFOBJ_STREAM) {
     return ((CPDF_Stream*)p)->GetDict();
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
index b436ba16f5..a36850bc2e 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp
@@ -277,8 +277,8 @@ FX_DWORD CPDF_Parser::SetEncryptHandler() {
   }
   CPDF_Object* pEncryptObj = m_pTrailer->GetElement(FX_BSTRC("Encrypt"));
   if (pEncryptObj) {
-    if (CPDF_Dictionary* pEncryptDict = pEncryptObj->AsDictionary()) {
-      SetEncryptDictionary(pEncryptDict);
+    if (pEncryptObj->GetType() == PDFOBJ_DICTIONARY) {
+      SetEncryptDictionary((CPDF_Dictionary*)pEncryptObj);
     } else if (pEncryptObj->GetType() == PDFOBJ_REFERENCE) {
       pEncryptObj = m_pDocument->GetIndirectObject(
           ((CPDF_Reference*)pEncryptObj)->GetRefObjNum());
@@ -804,7 +804,7 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() {
                             if (m_pTrailer) {
                               m_pTrailer->Release();
                             }
-                            m_pTrailer = ToDictionary(pDict->Clone());
+                            m_pTrailer = (CPDF_Dictionary*)pDict->Clone();
                           }
                         }
                       }
@@ -857,14 +857,15 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() {
               m_Syntax.RestorePos(pos + i - m_Syntax.m_HeaderOffset);
               CPDF_Object* pObj = m_Syntax.GetObject(m_pDocument, 0, 0, 0);
               if (pObj) {
-                if (!pObj->IsDictionary() && pObj->GetType() != PDFOBJ_STREAM) {
+                if (pObj->GetType() != PDFOBJ_DICTIONARY &&
+                    pObj->GetType() != PDFOBJ_STREAM) {
                   pObj->Release();
                 } else {
                   CPDF_Dictionary* pTrailer = NULL;
                   if (pObj->GetType() == PDFOBJ_STREAM) {
                     pTrailer = ((CPDF_Stream*)pObj)->GetDict();
                   } else {
-                    pTrailer = pObj->AsDictionary();
+                    pTrailer = (CPDF_Dictionary*)pObj;
                   }
                   if (pTrailer) {
                     if (m_pTrailer) {
@@ -889,7 +890,7 @@ FX_BOOL CPDF_Parser::RebuildCrossRef() {
                       }
                     } else {
                       if (pObj->GetType() == PDFOBJ_STREAM) {
-                        m_pTrailer = ToDictionary(pTrailer->Clone());
+                        m_pTrailer = (CPDF_Dictionary*)pTrailer->Clone();
                         pObj->Release();
                       } else {
                         m_pTrailer = pTrailer;
@@ -1033,13 +1034,13 @@ FX_BOOL CPDF_Parser::LoadCrossRefV5(FX_FILESIZE pos,
     return FALSE;
   }
   if (bMainXRef) {
-    m_pTrailer = ToDictionary(pStream->GetDict()->Clone());
+    m_pTrailer = (CPDF_Dictionary*)pStream->GetDict()->Clone();
     m_CrossRef.SetSize(size);
     if (m_V5Type.SetSize(size)) {
       FXSYS_memset(m_V5Type.GetData(), 0, size);
     }
   } else {
-    m_Trailers.Add(ToDictionary(pStream->GetDict()->Clone()));
+    m_Trailers.Add((CPDF_Dictionary*)pStream->GetDict()->Clone());
   }
   std::vector<std::pair<int32_t, int32_t> > arrIndex;
   CPDF_Array* pArray = pStream->GetDict()->GetArray(FX_BSTRC("Index"));
@@ -1489,9 +1490,9 @@ CPDF_Dictionary* CPDF_Parser::LoadTrailerV4() {
 
   nonstd::unique_ptr<CPDF_Object, ReleaseDeleter<CPDF_Object>> pObj(
       m_Syntax.GetObject(m_pDocument, 0, 0, 0));
-  if (!ToDictionary(pObj.get()))
+  if (!pObj || pObj->GetType() != PDFOBJ_DICTIONARY)
     return nullptr;
-  return pObj.release()->AsDictionary();
+  return static_cast<CPDF_Dictionary*>(pObj.release());
 }
 
 FX_DWORD CPDF_Parser::GetPermissions(FX_BOOL bCheckRevision) {
@@ -3489,7 +3490,7 @@ FX_BOOL CPDF_DataAvail::CheckPage(IFX_DownloadHints* pHints) {
         }
       }
     }
-    if (!pObj->IsDictionary()) {
+    if (pObj->GetType() != PDFOBJ_DICTIONARY) {
       pObj->Release();
       continue;
     }
@@ -4042,7 +4043,7 @@ FX_BOOL CPDF_DataAvail::CheckTrailer(IFX_DownloadHints* pHints) {
       pHints->AddSegment(m_Pos, iTrailerSize);
       return FALSE;
     }
-    if (!pTrailer->IsDictionary())
+    if (pTrailer->GetType() != PDFOBJ_DICTIONARY)
       return FALSE;
 
     CPDF_Dictionary* pTrailerDict = pTrailer->GetDict();
@@ -4157,7 +4158,7 @@ FX_BOOL CPDF_DataAvail::CheckUnkownPageNode(FX_DWORD dwPageNo,
     pPage->Release();
     return TRUE;
   }
-  if (!pPage->IsDictionary()) {
+  if (pPage->GetType() != PDFOBJ_DICTIONARY) {
     pPage->Release();
     m_docStatus = PDF_DATAAVAIL_ERROR;
     return FALSE;
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
index c34d8122f8..63454d2cb5 100644
--- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
+++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp
@@ -403,7 +403,7 @@ CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& buf, const CPDF_Object* pObj) {
       break;
     }
     case PDFOBJ_DICTIONARY: {
-      const CPDF_Dictionary* p = pObj->AsDictionary();
+      CPDF_Dictionary* p = (CPDF_Dictionary*)pObj;
       buf << FX_BSTRC("<<");
       FX_POSITION pos = p->GetStartPos();
       while (pos) {