From deee3d2ee201d62e7ef41e7d8378d7f52e057a9c Mon Sep 17 00:00:00 2001
From: tsepez <tsepez@chromium.org>
Date: Fri, 25 Mar 2016 14:38:58 -0700
Subject: Remove FX_DWORD from XFA, part 2

Some headers were missed in the previous CL.

Review URL: https://codereview.chromium.org/1835703002
---
 xfa/fgas/crt/fgas_stream.h | 14 +++++++-------
 xfa/fgas/crt/fgas_utils.h  |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'xfa/fgas/crt')

diff --git a/xfa/fgas/crt/fgas_stream.h b/xfa/fgas/crt/fgas_stream.h
index fd977c4a1b..3d644cf8b4 100644
--- a/xfa/fgas/crt/fgas_stream.h
+++ b/xfa/fgas/crt/fgas_stream.h
@@ -37,15 +37,15 @@ enum FX_STREAMSEEK {
 
 class IFX_Stream {
  public:
-  static IFX_Stream* CreateStream(IFX_FileRead* pFileRead, FX_DWORD dwAccess);
-  static IFX_Stream* CreateStream(IFX_FileWrite* pFileWrite, FX_DWORD dwAccess);
+  static IFX_Stream* CreateStream(IFX_FileRead* pFileRead, uint32_t dwAccess);
+  static IFX_Stream* CreateStream(IFX_FileWrite* pFileWrite, uint32_t dwAccess);
   static IFX_Stream* CreateStream(const FX_WCHAR* pszFileName,
-                                  FX_DWORD dwAccess);
+                                  uint32_t dwAccess);
   static IFX_Stream* CreateStream(uint8_t* pData,
                                   int32_t length,
-                                  FX_DWORD dwAccess);
+                                  uint32_t dwAccess);
   static IFX_Stream* CreateStream(IFX_BufferRead* pBufferRead,
-                                  FX_DWORD dwAccess,
+                                  uint32_t dwAccess,
                                   int32_t iFileSize = -1,
                                   FX_BOOL bReleaseBufferRead = TRUE);
   static IFX_Stream* CreateTextStream(IFX_Stream* pBaseStream,
@@ -53,7 +53,7 @@ class IFX_Stream {
   virtual ~IFX_Stream() {}
   virtual void Release() = 0;
   virtual IFX_Stream* Retain() = 0;
-  virtual FX_DWORD GetAccessModes() const = 0;
+  virtual uint32_t GetAccessModes() const = 0;
   virtual int32_t GetLength() const = 0;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0;
   virtual int32_t GetPosition() = 0;
@@ -70,7 +70,7 @@ class IFX_Stream {
   virtual int32_t GetBOM(uint8_t bom[4]) const = 0;
   virtual uint16_t GetCodePage() const = 0;
   virtual uint16_t SetCodePage(uint16_t wCodePage) = 0;
-  virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess,
+  virtual IFX_Stream* CreateSharedStream(uint32_t dwAccess,
                                          int32_t iOffset,
                                          int32_t iLength) = 0;
 };
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h
index cb133b0c33..5ebb32ff37 100644
--- a/xfa/fgas/crt/fgas_utils.h
+++ b/xfa/fgas/crt/fgas_utils.h
@@ -84,7 +84,7 @@ class CFX_BaseArrayTemplate : public CFX_BaseArray {
   }
 };
 typedef CFX_BaseArrayTemplate<void*> CFDE_PtrArray;
-typedef CFX_BaseArrayTemplate<FX_DWORD> CFDE_DWordArray;
+typedef CFX_BaseArrayTemplate<uint32_t> CFDE_DWordArray;
 typedef CFX_BaseArrayTemplate<uint16_t> CFDE_WordArray;
 
 template <class baseType>
@@ -281,7 +281,7 @@ class CFX_MassArrayTemplate : public CFX_BaseMassArray {
 };
 typedef CFX_MassArrayTemplate<void*> CFX_PtrMassArray;
 typedef CFX_MassArrayTemplate<int32_t> CFX_Int32MassArray;
-typedef CFX_MassArrayTemplate<FX_DWORD> CFX_DWordMassArray;
+typedef CFX_MassArrayTemplate<uint32_t> CFX_DWordMassArray;
 typedef CFX_MassArrayTemplate<uint16_t> CFX_WordMassArray;
 typedef CFX_MassArrayTemplate<CFX_Rect> CFX_RectMassArray;
 typedef CFX_MassArrayTemplate<CFX_RectF> CFX_RectFMassArray;
@@ -396,7 +396,7 @@ class CFX_DiscreteArrayTemplate : public CFX_BaseDiscreteArray {
   void RemoveAll() { CFX_BaseDiscreteArray::RemoveAll(); }
 };
 typedef CFX_DiscreteArrayTemplate<void*> CFX_PtrDiscreteArray;
-typedef CFX_DiscreteArrayTemplate<FX_DWORD> CFX_DWordDiscreteArray;
+typedef CFX_DiscreteArrayTemplate<uint32_t> CFX_DWordDiscreteArray;
 typedef CFX_DiscreteArrayTemplate<uint16_t> CFX_WordDiscreteArray;
 
 class CFX_BaseStack : public CFX_Target {
@@ -435,7 +435,7 @@ class CFX_StackTemplate : public CFX_BaseStack {
   }
 };
 typedef CFX_StackTemplate<void*> CFX_PtrStack;
-typedef CFX_StackTemplate<FX_DWORD> CFX_DWordStack;
+typedef CFX_StackTemplate<uint32_t> CFX_DWordStack;
 typedef CFX_StackTemplate<uint16_t> CFX_WordStack;
 typedef CFX_StackTemplate<int32_t> CFX_Int32Stack;
 
-- 
cgit v1.2.3