Re-land "Replace CPDF_Rect and CPDF_Point with CFX types."

core/include/fpdfapi/fpdf_parser.h

 // 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
 
 #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_
 
 #include <map>
@@ skipping 654 matching lines @@
   virtual FX_BOOL CryptStream(void* context,
                               const uint8_t* src_buf,
                               FX_DWORD src_size,
                               CFX_BinaryBuf& dest_buf,
                               FX_BOOL bEncrypt);
   virtual FX_BOOL CryptFinish(void* context,
                               CFX_BinaryBuf& dest_buf,
                               FX_BOOL bEncrypt);
 
   uint8_t m_EncryptKey[32];
-
   int m_KeyLen;
-
   int m_Cipher;
-
   uint8_t* m_pAESContext;
 };
-class CPDF_Point {
- public:
-  CPDF_Point(FX_FLOAT xx, FX_FLOAT yy) {
-    x = xx;
-    y = yy;
-  }
 
-  FX_FLOAT x;
-
-  FX_FLOAT y;
-};
-
-#define CPDF_Rect CFX_FloatRect
 CFX_ByteString PDF_NameDecode(const CFX_ByteStringC& orig);
 CFX_ByteString PDF_NameDecode(const CFX_ByteString& orig);
 CFX_ByteString PDF_NameEncode(const CFX_ByteString& orig);
 CFX_ByteString PDF_EncodeString(const CFX_ByteString& src,
                                 FX_BOOL bHex = FALSE);
 CFX_WideString PDF_DecodeText(const uint8_t* pData, FX_DWORD size);
 CFX_WideString PDF_DecodeText(const CFX_ByteString& bstr);
 CFX_ByteString PDF_EncodeText(const FX_WCHAR* pString, int len = -1);
 CFX_ByteString PDF_EncodeText(const CFX_WideString& str);
 
-FX_FLOAT PDF_ClipFloat(FX_FLOAT f);
 class CFDF_Document : public CPDF_IndirectObjectHolder {
  public:
   static CFDF_Document* CreateNewDoc();
   static CFDF_Document* ParseFile(IFX_FileRead* pFile,
                                   FX_BOOL bOwnFile = FALSE);
   static CFDF_Document* ParseMemory(const uint8_t* pData, FX_DWORD size);
-
   ~CFDF_Document();
 
   FX_BOOL WriteBuf(CFX_ByteTextBuf& buf) const;
-
   CPDF_Dictionary* GetRoot() const { return m_pRootDict; }
 
  protected:
   CFDF_Document();
   void ParseStream(IFX_FileRead* pFile, FX_BOOL bOwnFile);
+
   CPDF_Dictionary* m_pRootDict;
   IFX_FileRead* m_pFile;
   FX_BOOL m_bOwnFile;
 };
 
 void FlateEncode(const uint8_t* src_buf,
                  FX_DWORD src_size,
                  uint8_t*& dest_buf,
                  FX_DWORD& dest_size);
 void FlateEncode(const uint8_t* src_buf,
@@ skipping 149 matching lines @@
                        FX_DWORD src_size,
                        const CPDF_Dictionary* pDict,
                        uint8_t*& dest_buf,
                        FX_DWORD& dest_size,
                        CFX_ByteString& ImageEncoding,
                        CPDF_Dictionary*& pImageParms,
                        FX_DWORD estimated_size,
                        FX_BOOL bImageAcc);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_