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

This reverts commit 937840e1722d1f2b77d80575d6e710d760662c9c.

Add type cast definitions for CPDF_Dictionary.

This CL adds ToCPDFDictionary type definitions and updates one file to use
instead of straight casts. I had to fix two places where we'd casted off the
constness of the original pointer.

BUG=pdfium:201
R=tsepez@chromium.org

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

1 files changed, 6 insertions, 9 deletions

diff --git a/core/src/fpdfdoc/doc_ocg.cpp b/core/src/fpdfdoc/doc_ocg.cpp
index 70ad9c710d..e66b04489f 100644
--- a/core/src/fpdfdoc/doc_ocg.cpp
+++ b/core/src/fpdfdoc/doc_ocg.cpp
@@ -209,9 +209,8 @@ FX_BOOL CPDF_OCContext::GetOCGVE(CPDF_Array* pExpression,
     if (pOCGObj == NULL) {
       return FALSE;
     }
-    if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
-      return !(bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj)
-                           : GetOCGVisible((CPDF_Dictionary*)pOCGObj));
+    if (CPDF_Dictionary* pDict = pOCGObj->AsDictionary()) {
+      return !(bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict));
     }
     if (pOCGObj->GetType() == PDFOBJ_ARRAY) {
       return !GetOCGVE((CPDF_Array*)pOCGObj, bFromConfig, nLevel + 1);
@@ -226,9 +225,8 @@ FX_BOOL CPDF_OCContext::GetOCGVE(CPDF_Array* pExpression,
         continue;
       }
       FX_BOOL bItem = FALSE;
-      if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
-        bItem = bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj)
-                            : GetOCGVisible((CPDF_Dictionary*)pOCGObj);
+      if (CPDF_Dictionary* pDict = pOCGObj->AsDictionary()) {
+        bItem = bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict);
       } else if (pOCGObj->GetType() == PDFOBJ_ARRAY) {
         bItem = GetOCGVE((CPDF_Array*)pOCGObj, bFromConfig, nLevel + 1);
       }
@@ -258,9 +256,8 @@ FX_BOOL CPDF_OCContext::LoadOCMDState(const CPDF_Dictionary* pOCMDDict,
   if (pOCGObj == NULL) {
     return TRUE;
   }
-  if (pOCGObj->GetType() == PDFOBJ_DICTIONARY) {
-    return bFromConfig ? LoadOCGState((CPDF_Dictionary*)pOCGObj)
-                       : GetOCGVisible((CPDF_Dictionary*)pOCGObj);
+  if (const CPDF_Dictionary* pDict = pOCGObj->AsDictionary()) {
+    return bFromConfig ? LoadOCGState(pDict) : GetOCGVisible(pDict);
   }
   if (pOCGObj->GetType() != PDFOBJ_ARRAY) {
     return TRUE;