Merge to XFA: Revert "Revert "Add type cast definitions for CPDF_Reference.""

fpdfsdk/src/fpdf_flatten.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 "../../public/fpdf_flatten.h"
 #include "../include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
@@ skipping 426 matching lines @@
         continue;
 
       if (!sAnnotState.IsEmpty()) {
         pAPStream = pAPDic->GetStream(sAnnotState);
       } else {
         FX_POSITION pos = pAPDic->GetStartPos();
         if (pos) {
           CFX_ByteString sKey;
           CPDF_Object* pFirstObj = pAPDic->GetNextElement(pos, sKey);
           if (pFirstObj) {
-            if (pFirstObj->GetType() == PDFOBJ_REFERENCE)
+            if (pFirstObj->IsReference())
               pFirstObj = pFirstObj->GetDirect();
-
             if (!pFirstObj->IsStream())
               continue;
-
             pAPStream = pFirstObj->AsStream();
           }
         }
       }
     }
     if (!pAPStream)
       continue;
 
     CPDF_Dictionary* pAPDic = pAPStream->GetDict();
     CFX_AffineMatrix matrix = pAPDic->GetMatrix("Matrix");
@@ skipping 52 matching lines @@
     pNewXObject->SetData((const uint8_t*)sStream, sStream.GetLength(), FALSE,
                          FALSE);
   }
   pPageDict->RemoveAt("Annots");
 
   ObjectArray.RemoveAll();
   RectArray.RemoveAll();
 
   return FLATTEN_SUCCESS;
 }