Remove FX_DWORD from core/ and delete definitionchromium/2695chromium/2694chromium/2693chromium/2692

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

4 files changed, 16 insertions, 16 deletions

diff --git a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
index e265cd4ce0..6f239e661f 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h
@@ -17,10 +17,10 @@ class CPDF_TextObject;
 
 class CPDF_ClipPath : public CFX_CountRef<CPDF_ClipPathData> {
  public:
-  FX_DWORD GetPathCount() const { return m_pObject->m_PathCount; }
+  uint32_t GetPathCount() const { return m_pObject->m_PathCount; }
   CPDF_Path GetPath(int i) const { return m_pObject->m_pPathList[i]; }
   int GetClipType(int i) const { return m_pObject->m_pTypeList[i]; }
-  FX_DWORD GetTextCount() const { return m_pObject->m_TextCount; }
+  uint32_t GetTextCount() const { return m_pObject->m_TextCount; }
   CPDF_TextObject* GetText(int i) const { return m_pObject->m_pTextList[i]; }
   CFX_FloatRect GetClipBox() const;
 
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
index afdd71dc4d..6be55f47b9 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
@@ -37,7 +37,7 @@ class CPDF_ColorSpace {
   int GetBufSize() const;
   FX_FLOAT* CreateBuf();
   void GetDefaultColor(FX_FLOAT* buf) const;
-  FX_DWORD CountComponents() const { return m_nComponents; }
+  uint32_t CountComponents() const { return m_nComponents; }
   int GetFamily() const { return m_Family; }
   virtual void GetDefaultValue(int iComponent,
                                FX_FLOAT& value,
@@ -87,7 +87,7 @@ class CPDF_ColorSpace {
   CPDF_Document* const m_pDocument;
 
  protected:
-  CPDF_ColorSpace(CPDF_Document* pDoc, int family, FX_DWORD nComponents)
+  CPDF_ColorSpace(CPDF_Document* pDoc, int family, uint32_t nComponents)
       : m_pDocument(pDoc),
         m_Family(family),
         m_nComponents(nComponents),
@@ -114,9 +114,9 @@ class CPDF_ColorSpace {
   }
 
   int m_Family;
-  FX_DWORD m_nComponents;
+  uint32_t m_nComponents;
   CPDF_Array* m_pArray;
-  FX_DWORD m_dwStdConversion;
+  uint32_t m_dwStdConversion;
 };
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_image.h b/core/fpdfapi/fpdf_page/include/cpdf_image.h
index 9153e9a660..48349deb3b 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_image.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_image.h
@@ -52,14 +52,14 @@ class CPDF_Image {
   FX_BOOL IsInterpol() const { return m_bInterpolate; }
 
   CFX_DIBSource* LoadDIBSource(CFX_DIBSource** ppMask = NULL,
-                               FX_DWORD* pMatteColor = NULL,
+                               uint32_t* pMatteColor = NULL,
                                FX_BOOL bStdCS = FALSE,
-                               FX_DWORD GroupFamily = 0,
+                               uint32_t GroupFamily = 0,
                                FX_BOOL bLoadMask = FALSE) const;
 
   void SetInlineDict(CPDF_Dictionary* pDict) { m_pInlineDict = pDict; }
   void SetImage(const CFX_DIBitmap* pDIBitmap, int32_t iCompress);
-  void SetJpegImage(uint8_t* pImageData, FX_DWORD size);
+  void SetJpegImage(uint8_t* pImageData, uint32_t size);
   void SetJpegImage(IFX_FileRead* pFile);
 
   void ResetCache(CPDF_Page* pPage, const CFX_DIBitmap* pDIBitmap);
@@ -67,7 +67,7 @@ class CPDF_Image {
   FX_BOOL StartLoadDIBSource(CPDF_Dictionary* pFormResource,
                              CPDF_Dictionary* pPageResource,
                              FX_BOOL bStdCS = FALSE,
-                             FX_DWORD GroupFamily = 0,
+                             uint32_t GroupFamily = 0,
                              FX_BOOL bLoadMask = FALSE);
   FX_BOOL Continue(IFX_Pause* pPause);
   CFX_DIBSource* DetachBitmap();
@@ -75,10 +75,10 @@ class CPDF_Image {
 
   CFX_DIBSource* m_pDIBSource;
   CFX_DIBSource* m_pMask;
-  FX_DWORD m_MatteColor;
+  uint32_t m_MatteColor;
 
  private:
-  CPDF_Dictionary* InitJPEG(uint8_t* pData, FX_DWORD size);
+  CPDF_Dictionary* InitJPEG(uint8_t* pData, uint32_t size);
 
   CPDF_Stream* m_pStream;
   FX_BOOL m_bInline;
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
index bb268c1446..c47180ef6b 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h
@@ -12,7 +12,7 @@
 #include "core/fxcrt/include/fx_system.h"
 
 struct CPDF_TextObjectItem {
-  FX_DWORD m_CharCode;
+  uint32_t m_CharCode;
   FX_FLOAT m_OriginX;
   FX_FLOAT m_OriginY;
 };
@@ -33,9 +33,9 @@ class CPDF_TextObject : public CPDF_PageObject {
   int CountItems() const { return m_nChars; }
   void GetItemInfo(int index, CPDF_TextObjectItem* pInfo) const;
   int CountChars() const;
-  void GetCharInfo(int index, FX_DWORD& charcode, FX_FLOAT& kerning) const;
+  void GetCharInfo(int index, uint32_t& charcode, FX_FLOAT& kerning) const;
   void GetCharInfo(int index, CPDF_TextObjectItem* pInfo) const;
-  FX_FLOAT GetCharWidth(FX_DWORD charcode) const;
+  FX_FLOAT GetCharWidth(uint32_t charcode) const;
   FX_FLOAT GetPosX() const { return m_PosX; }
   FX_FLOAT GetPosY() const { return m_PosY; }
   void GetTextMatrix(CFX_Matrix* pMatrix) const;
@@ -62,7 +62,7 @@ class CPDF_TextObject : public CPDF_PageObject {
   FX_FLOAT m_PosX;
   FX_FLOAT m_PosY;
   int m_nChars;
-  FX_DWORD* m_pCharCodes;
+  uint32_t* m_pCharCodes;
   FX_FLOAT* m_pCharPos;
 };