Merge to XFA: Use stdint.h types throughout PDFium.

Near-automatic merge, plus re-running scripts to update
additional usage.

R=thestig@chromium.org

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

4 files changed, 15 insertions, 15 deletions

diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index 8f715e77b6..e531b55a53 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -30,14 +30,14 @@ protected:
     void CalCaption(IFWL_Widget *pWidget, CFX_RectF &rect);

     void CalIcon(IFWL_Widget *pWidget, CFX_RectF &rect);

 

-    void DrawFormBorder(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawNarrowCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawCloseBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawMinMaxBoxCommon(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawMinimizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawMaximizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, FX_BOOL bMax, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

-    void DrawIconImage(CFX_Graphics *pGraphics, CFX_DIBitmap *pDIBitmap, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);

+    void DrawFormBorder(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawNarrowCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawCloseBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawMinMaxBoxCommon(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawMinimizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawMaximizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect,  FWLTHEME_STATE eState, FX_BOOL bMax, CFX_Matrix *pMatrix, int32_t iActive = 0);

+    void DrawIconImage(CFX_Graphics *pGraphics, CFX_DIBitmap *pDIBitmap, const CFX_RectF *pRect,  FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);

     void SetThemeData(FX_DWORD dwID);

     void TransModeColor(FX_ARGB clrFore, FX_ARGB &clrBack);

     void DeactiveForm();

diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index b27afc47f4..f6db37b95e 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -28,7 +28,7 @@ protected:
     void	SetBackgroudColor(FX_DWORD *pData);

     void	SetCaptionColor(FX_DWORD *pData);

     void	SetCornerColor(FX_DWORD *pData);

-    FX_INT32	GetColorID(FX_DWORD dwStates);

+    int32_t	GetColorID(FX_DWORD dwStates);

 

     struct PBThemeData {

         FX_ARGB clrBorder[5];

diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h
index f1b6b55876..fbad2ad977 100644
--- a/xfa/include/fwl/theme/utils.h
+++ b/xfa/include/fwl/theme/utils.h
@@ -28,10 +28,10 @@ typedef struct _FWLCOLOR {
     union {

         FX_DWORD color;

         struct {

-            FX_BYTE b;

-            FX_BYTE g;

-            FX_BYTE r;

-            FX_BYTE a;

+            uint8_t b;

+            uint8_t g;

+            uint8_t r;

+            uint8_t a;

         };

     };

 

diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 57348e4c75..5a07c7ea03 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -47,7 +47,7 @@ protected:
     void	DrawBorder(CFX_Graphics *pGraphics, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);

     void	FillBackground(CFX_Graphics *pGraphics, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);

     void	FillSoildRect(CFX_Graphics *pGraphics, FX_ARGB fillColor, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);

-    void	DrawAxialShading(CFX_Graphics *pGraphics, FX_FLOAT fx1, FX_FLOAT fy1, FX_FLOAT fx2, FX_FLOAT fy2, FX_ARGB beginColor, FX_ARGB endColor, CFX_Path *path, FX_INT32 fillMode = FXFILL_WINDING, CFX_Matrix *pMatrix = NULL);

+    void	DrawAxialShading(CFX_Graphics *pGraphics, FX_FLOAT fx1, FX_FLOAT fy1, FX_FLOAT fx2, FX_FLOAT fy2, FX_ARGB beginColor, FX_ARGB endColor, CFX_Path *path, int32_t fillMode = FXFILL_WINDING, CFX_Matrix *pMatrix = NULL);

     void	DrawAnnulusRect(CFX_Graphics *pGraphics, FX_ARGB fillColor, const CFX_RectF *pRect, FX_FLOAT fRingWidth = 1, CFX_Matrix *pMatrix = NULL);

     void	DrawAnnulusCircle(CFX_Graphics *pGraphics, FX_ARGB fillColor, const CFX_RectF *pRect, FX_FLOAT fWidth = 1, CFX_Matrix *pMatrix = NULL);

     void	DrawFocus(CFX_Graphics *pGraphics, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);

@@ -55,7 +55,7 @@ protected:
     void	DrawArrow(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FX_ARGB argSign, CFX_Matrix *pMatrix = NULL);

     void	DrawBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);

     void	DrawArrowBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);

-    FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, FX_BYTE scale);

+    FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, uint8_t scale);

     FX_DWORD		m_dwRefCount;

     IFDE_TextOut   *m_pTextOut;

     IFX_Font	   *m_pFDEFont;