Remove FX_DWORD from core/ and delete definition

core/fpdfapi/fpdf_page/pageint.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_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 #define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
 
 #include <map>
@@ skipping 21 matching lines @@
 class CPDF_StreamAcc;
 class CPDF_TextObject;
 class CPDF_Type3Char;
 
 #define PARSE_STEP_LIMIT 100
 
 class CPDF_StreamParser {
  public:
   enum SyntaxType { EndOfData, Number, Keyword, Name, Others };
 
-  CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize);
+  CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize);
   ~CPDF_StreamParser();
 
   CPDF_Stream* ReadInlineStream(CPDF_Document* pDoc,
                                 CPDF_Dictionary* pDict,
                                 CPDF_Object* pCSObj,
                                 FX_BOOL bDecode);
   SyntaxType ParseNextElement();
   uint8_t* GetWordBuf() { return m_WordBuffer; }
-  FX_DWORD GetWordSize() const { return m_WordSize; }
+  uint32_t GetWordSize() const { return m_WordSize; }
   CPDF_Object* GetObject() {
     CPDF_Object* pObj = m_pLastObj;
     m_pLastObj = NULL;
     return pObj;
   }
-  FX_DWORD GetPos() const { return m_Pos; }
-  void SetPos(FX_DWORD pos) { m_Pos = pos; }
+  uint32_t GetPos() const { return m_Pos; }
+  void SetPos(uint32_t pos) { m_Pos = pos; }
   CPDF_Object* ReadNextObject(FX_BOOL bAllowNestedArray = FALSE,
                               FX_BOOL bInArray = FALSE);
   void SkipPathObject();
 
  protected:
   friend class fpdf_page_parser_old_ReadHexString_Test;
 
   void GetNextWord(FX_BOOL& bIsNumber);
   CFX_ByteString ReadString();
   CFX_ByteString ReadHexString();
   const uint8_t* m_pBuf;
 
   // Length in bytes of m_pBuf.
-  FX_DWORD m_Size;
+  uint32_t m_Size;
 
   // Current byte position within m_pBuf.
-  FX_DWORD m_Pos;
+  uint32_t m_Pos;
 
   uint8_t m_WordBuffer[256];
-  FX_DWORD m_WordSize;
+  uint32_t m_WordSize;
   CPDF_Object* m_pLastObj;
 
  private:
   bool PositionIsInBounds() const;
 };
 
 #define PARAM_BUF_SIZE 16
 struct ContentParam {
   enum Type { OBJECT = 0, NUMBER, NAME };
   Type m_Type;
@@ skipping 32 matching lines @@
   CPDF_PageObjectHolder* GetPageObjectHolder() const { return m_pObjectHolder; }
   CPDF_AllStates* GetCurStates() const { return m_pCurStates.get(); }
   FX_BOOL IsColored() const { return m_bColored; }
   const FX_FLOAT* GetType3Data() const { return m_Type3Data; }
 
   void AddNumberParam(const FX_CHAR* str, int len);
   void AddObjectParam(CPDF_Object* pObj);
   void AddNameParam(const FX_CHAR* name, int size);
   int GetNextParamPos();
   void ClearAllParams();
-  CPDF_Object* GetObject(FX_DWORD index);
-  CFX_ByteString GetString(FX_DWORD index);
-  FX_FLOAT GetNumber(FX_DWORD index);
-  FX_FLOAT GetNumber16(FX_DWORD index);
-  int GetInteger(FX_DWORD index) { return (int32_t)(GetNumber(index)); }
+  CPDF_Object* GetObject(uint32_t index);
+  CFX_ByteString GetString(uint32_t index);
+  FX_FLOAT GetNumber(uint32_t index);
+  FX_FLOAT GetNumber16(uint32_t index);
+  int GetInteger(uint32_t index) { return (int32_t)(GetNumber(index)); }
   void OnOperator(const FX_CHAR* op);
   void BigCaseCaller(int index);
-  FX_DWORD GetParsePos() { return m_pSyntax->GetPos(); }
+  uint32_t GetParsePos() { return m_pSyntax->GetPos(); }
   void AddTextObject(CFX_ByteString* pText,
                      FX_FLOAT fInitKerning,
                      FX_FLOAT* pKerning,
                      int count);
 
   void ConvertUserSpace(FX_FLOAT& x, FX_FLOAT& y);
   void ConvertTextSpace(FX_FLOAT& x, FX_FLOAT& y);
   void OnChangeTextMatrix();
-  FX_DWORD Parse(const uint8_t* pData, FX_DWORD dwSize, FX_DWORD max_cost);
+  uint32_t Parse(const uint8_t* pData, uint32_t dwSize, uint32_t max_cost);
   void ParsePathObject();
   void AddPathPoint(FX_FLOAT x, FX_FLOAT y, int flag);
   void AddPathRect(FX_FLOAT x, FX_FLOAT y, FX_FLOAT w, FX_FLOAT h);
   void AddPathObject(int FillType, FX_BOOL bStroke);
   CPDF_ImageObject* AddImage(CPDF_Stream* pStream,
                              CPDF_Image* pImage,
                              FX_BOOL bInline);
   void AddDuplicateImage();
   void AddForm(CPDF_Stream* pStream);
   void SetGraphicStates(CPDF_PageObject* pObj,
                         FX_BOOL bColor,
                         FX_BOOL bText,
                         FX_BOOL bGraph);
   void SaveStates(CPDF_AllStates* pState);
   void RestoreStates(CPDF_AllStates* pState);
   CPDF_Font* FindFont(const CFX_ByteString& name);
   CPDF_ColorSpace* FindColorSpace(const CFX_ByteString& name);
   CPDF_Pattern* FindPattern(const CFX_ByteString& name, FX_BOOL bShading);
   CPDF_Object* FindResourceObj(const CFX_ByteStringC& type,
                                const CFX_ByteString& name);
 
  protected:
   using OpCodes =
-      std::unordered_map<FX_DWORD, void (CPDF_StreamContentParser::*)()>;
+      std::unordered_map<uint32_t, void (CPDF_StreamContentParser::*)()>;
   static OpCodes InitializeOpCodes();
 
   void Handle_CloseFillStrokePath();
   void Handle_FillStrokePath();
   void Handle_CloseEOFillStrokePath();
   void Handle_EOFillStrokePath();
   void Handle_BeginMarkedContent_Dictionary();
   void Handle_BeginImage();
   void Handle_BeginMarkedContent();
   void Handle_BeginText();
@@ skipping 65 matching lines @@
   CPDF_Document* const m_pDocument;
   CPDF_Dictionary* m_pPageResources;
   CPDF_Dictionary* m_pParentResources;
   CPDF_Dictionary* m_pResources;
   CPDF_PageObjectHolder* m_pObjectHolder;
   int m_Level;
   CFX_Matrix m_mtContentToUser;
   CFX_FloatRect m_BBox;
   CPDF_ParseOptions m_Options;
   ContentParam m_ParamBuf[PARAM_BUF_SIZE];
-  FX_DWORD m_ParamStartPos;
-  FX_DWORD m_ParamCount;
+  uint32_t m_ParamStartPos;
+  uint32_t m_ParamCount;
   CPDF_StreamParser* m_pSyntax;
   std::unique_ptr<CPDF_AllStates> m_pCurStates;
   CPDF_ContentMark m_CurContentMark;
   CFX_ArrayTemplate<CPDF_TextObject*> m_ClipTextList;
   CPDF_TextObject* m_pLastTextObject;
   FX_FLOAT m_DefFontSize;
   FX_PATHPOINT* m_pPathPoints;
   int m_PathPointCount;
   int m_PathAllocSize;
   FX_FLOAT m_PathStartX;
@@ skipping 37 matching lines @@
     STAGE_PARSE,
     STAGE_CHECKCLIP,
   };
 
   ParseStatus m_Status;
   InternalStage m_InternalStage;
   CPDF_PageObjectHolder* m_pObjectHolder;
   FX_BOOL m_bForm;
   CPDF_ParseOptions m_Options;
   CPDF_Type3Char* m_pType3Char;
-  FX_DWORD m_nStreams;
+  uint32_t m_nStreams;
   std::unique_ptr<CPDF_StreamAcc> m_pSingleStream;
   std::vector<std::unique_ptr<CPDF_StreamAcc>> m_StreamArray;
   uint8_t* m_pData;
-  FX_DWORD m_Size;
-  FX_DWORD m_CurrentOffset;
+  uint32_t m_Size;
+  uint32_t m_CurrentOffset;
   std::unique_ptr<CPDF_StreamContentParser> m_pParser;
 };
 
 class CPDF_DocPageData {
  public:
   explicit CPDF_DocPageData(CPDF_Document* pPDFDoc);
   ~CPDF_DocPageData();
 
   void Clear(FX_BOOL bRelease = FALSE);
   CPDF_Font* GetFont(CPDF_Dictionary* pFontDict, FX_BOOL findOnly);
@@ skipping 22 matching lines @@
  private:
   using CPDF_CountedFont = CPDF_CountedObject<CPDF_Font>;
   using CPDF_CountedIccProfile = CPDF_CountedObject<CPDF_IccProfile>;
   using CPDF_CountedImage = CPDF_CountedObject<CPDF_Image>;
   using CPDF_CountedStreamAcc = CPDF_CountedObject<CPDF_StreamAcc>;
 
   using CPDF_ColorSpaceMap = std::map<CPDF_Object*, CPDF_CountedColorSpace*>;
   using CPDF_FontFileMap = std::map<CPDF_Stream*, CPDF_CountedStreamAcc*>;
   using CPDF_FontMap = std::map<CPDF_Dictionary*, CPDF_CountedFont*>;
   using CPDF_IccProfileMap = std::map<CPDF_Stream*, CPDF_CountedIccProfile*>;
-  using CPDF_ImageMap = std::map<FX_DWORD, CPDF_CountedImage*>;
+  using CPDF_ImageMap = std::map<uint32_t, CPDF_CountedImage*>;
   using CPDF_PatternMap = std::map<CPDF_Object*, CPDF_CountedPattern*>;
 
   CPDF_Document* const m_pPDFDoc;
   FX_BOOL m_bForceClear;
   std::map<CFX_ByteString, CPDF_Stream*> m_HashProfileMap;
   CPDF_ColorSpaceMap m_ColorSpaceMap;
   CPDF_FontFileMap m_FontFileMap;
   CPDF_FontMap m_FontMap;
   CPDF_IccProfileMap m_IccProfileMap;
   CPDF_ImageMap m_ImageMap;
@@ skipping 59 matching lines @@
 
   std::vector<CPDF_Function*> m_pSubFunctions;
   FX_FLOAT* m_pBounds;
   FX_FLOAT* m_pEncode;
 
   static const int kRequiredNumInputs = 1;
 };
 
 class CPDF_IccProfile {
  public:
-  CPDF_IccProfile(const uint8_t* pData, FX_DWORD dwSize);
+  CPDF_IccProfile(const uint8_t* pData, uint32_t dwSize);
   ~CPDF_IccProfile();
-  FX_DWORD GetComponents() const { return m_nSrcComponents; }
+  uint32_t GetComponents() const { return m_nSrcComponents; }
   FX_BOOL m_bsRGB;
   void* m_pTransform;
 
  private:
-  FX_DWORD m_nSrcComponents;
+  uint32_t m_nSrcComponents;
 };
 
 class CPDF_DeviceCS : public CPDF_ColorSpace {
  public:
   CPDF_DeviceCS(CPDF_Document* pDoc, int family);
 
   FX_BOOL GetRGB(FX_FLOAT* pBuf,
                  FX_FLOAT& R,
                  FX_FLOAT& G,
                  FX_FLOAT& B) const override;
@@ skipping 40 matching lines @@
   CPDF_Pattern* m_pPattern;
   CPDF_CountedPattern* m_pCountedPattern;
   int m_nComps;
   FX_FLOAT m_Comps[MAX_PATTERN_COLORCOMPS];
 };
 
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 bool IsPathOperator(const uint8_t* buf, size_t len);
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_