diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/src/fdp/include/fde_psr.h | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz | |
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
Diffstat (limited to 'xfa/src/fdp/include/fde_psr.h')
| -rw-r--r-- | xfa/src/fdp/include/fde_psr.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/src/fdp/include/fde_psr.h b/xfa/src/fdp/include/fde_psr.h index 64070e6648..974f4cc879 100644 --- a/xfa/src/fdp/include/fde_psr.h +++ b/xfa/src/fdp/include/fde_psr.h @@ -35,12 +35,12 @@ public: class IFDE_TextSet : public IFDE_VisualSet
{
public:
- virtual FX_INT32 GetString(FDE_HVISUALOBJ hText, CFX_WideString &wsText) = 0;
+ virtual int32_t GetString(FDE_HVISUALOBJ hText, CFX_WideString &wsText) = 0;
virtual IFX_Font* GetFont(FDE_HVISUALOBJ hText) = 0;
virtual FX_FLOAT GetFontSize(FDE_HVISUALOBJ hText) = 0;
virtual FX_ARGB GetFontColor(FDE_HVISUALOBJ hText) = 0;
- virtual FX_INT32 GetDisplayPos(FDE_HVISUALOBJ hText, FXTEXT_CHARPOS *pCharPos, FX_BOOL bCharCode = FALSE, CFX_WideString *pWSForms = NULL) = 0;
- virtual FX_INT32 GetCharRects(FDE_HVISUALOBJ hText, CFX_RectFArray &rtArray) = 0;
+ virtual int32_t GetDisplayPos(FDE_HVISUALOBJ hText, FXTEXT_CHARPOS *pCharPos, FX_BOOL bCharCode = FALSE, CFX_WideString *pWSForms = NULL) = 0;
+ virtual int32_t GetCharRects(FDE_HVISUALOBJ hText, CFX_RectFArray &rtArray) = 0;
};
class IFDE_ImageSet : public IFDE_VisualSet
{
@@ -58,8 +58,8 @@ class IFDE_PathSet : public IFDE_VisualSet {
public:
virtual IFDE_Path* GetPath(FDE_HVISUALOBJ hPath) = 0;
- virtual FX_INT32 GetFillMode(FDE_HVISUALOBJ hPath) = 0;
- virtual FX_INT32 GetRenderMode(FDE_HVISUALOBJ hPath) = 0;
+ virtual int32_t GetFillMode(FDE_HVISUALOBJ hPath) = 0;
+ virtual int32_t GetRenderMode(FDE_HVISUALOBJ hPath) = 0;
virtual IFDE_Pen* GetPen(FDE_HVISUALOBJ hPath) = 0;
virtual FX_FLOAT GetPenWidth(FDE_HVISUALOBJ hPath) = 0;
virtual IFDE_Brush* GetBrush(FDE_HVISUALOBJ hPath) = 0;
@@ -76,10 +76,10 @@ class IFDE_WidgetSet : public IFDE_VisualSet {
public:
virtual FDE_WIDGETOBJ GetWidgetType(FDE_HVISUALOBJ hWidget) = 0;
- virtual FX_FLOAT GetFloat(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, FX_FLOAT fDefVal = 0.0f) = 0;
- virtual FX_INT32 GetInteger(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, FX_INT32 iDefVal = 0) = 0;
- virtual FX_BOOL GetString(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, CFX_WideString &wsValue) = 0;
- virtual FX_BOOL GetRects(FDE_HVISUALOBJ hWidget, FX_INT32 iParameter, CFX_RectFArray &rects) = 0;
+ virtual FX_FLOAT GetFloat(FDE_HVISUALOBJ hWidget, int32_t iParameter, FX_FLOAT fDefVal = 0.0f) = 0;
+ virtual int32_t GetInteger(FDE_HVISUALOBJ hWidget, int32_t iParameter, int32_t iDefVal = 0) = 0;
+ virtual FX_BOOL GetString(FDE_HVISUALOBJ hWidget, int32_t iParameter, CFX_WideString &wsValue) = 0;
+ virtual FX_BOOL GetRects(FDE_HVISUALOBJ hWidget, int32_t iParameter, CFX_RectFArray &rects) = 0;
};
class IFDE_VisualSetIterator
{
|