xfa/src/fdp/include/fde_tto.h - Issue 1172793002: Merge to XFA: Use stdint.h types throughout PDFium.

Unified Diff: xfa/src/fdp/include/fde_tto.h

Issue 1172793002: Merge to XFA: Use stdint.h types throughout PDFium. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: xfa/src/fdp/include/fde_tto.h

diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h

index 25dead13cabe903cff9dba1f27bd8f87760e3d4c..8b4d1d47878027e6af6052e55e7e8b0e4fd31b43 100644

--- a/xfa/src/fdp/include/fde_tto.h

+++ b/xfa/src/fdp/include/fde_tto.h

@@ -43,7 +43,7 @@ public:

virtual void SetTabWidth(FX_FLOAT fTabWidth) = 0;

virtual void SetEllipsisString(const CFX_WideString &wsEllipsis) = 0;

virtual void SetParagraphBreakChar(FX_WCHAR wch) = 0;

- virtual void SetAlignment(FX_INT32 iAlignment) = 0;

+ virtual void SetAlignment(int32_t iAlignment) = 0;

virtual void SetLineSpace(FX_FLOAT fLineSpace) = 0;

virtual void SetDIBitmap(CFX_DIBitmap *pDIB) = 0;

virtual void SetRenderDevice(CFX_RenderDevice *pDevice) = 0;

@@ -51,19 +51,19 @@ public:

virtual void SetClipRect(const CFX_RectF &rtClip) = 0;

virtual void SetMatrix(const CFX_Matrix &matrix) = 0;

virtual void SetLineBreakTolerance(FX_FLOAT fTolerance) = 0;

- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_Size &size) = 0;

- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_SizeF &size) = 0;

- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_Rect &rect) = 0;

- virtual void CalcSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect) = 0;

- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_INT32 x, FX_INT32 y) = 0;

- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_FLOAT x, FX_FLOAT y) = 0;

- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_Rect &rect) = 0;

- virtual void DrawText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect) = 0;

+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Size &size) = 0;

+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0;

+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_Rect &rect) = 0;

+ virtual void CalcSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0;

+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, int32_t x, int32_t y) = 0;

+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;

+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_Rect &rect) = 0;

+ virtual void DrawText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;

virtual void SetLogicClipRect(const CFX_RectF &rtClip) = 0;

- virtual void CalcLogicSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_SizeF &size) = 0;

- virtual void CalcLogicSize(FX_LPCWSTR pwsStr, FX_INT32 iLength, CFX_RectF &rect) = 0;

- virtual void DrawLogicText(FX_LPCWSTR pwsStr, FX_INT32 iLength, FX_FLOAT x, FX_FLOAT y) = 0;

- virtual void DrawLogicText(FX_LPCWSTR pwsStr, FX_INT32 iLength, const CFX_RectF &rect) = 0;

- virtual FX_INT32 GetTotalLines() = 0;

+ virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_SizeF &size) = 0;

+ virtual void CalcLogicSize(FX_LPCWSTR pwsStr, int32_t iLength, CFX_RectF &rect) = 0;

+ virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;

+ virtual void DrawLogicText(FX_LPCWSTR pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;

+ virtual int32_t GetTotalLines() = 0;

};

#endif

« no previous file with comments | « xfa/src/fdp/include/fde_rdv.h ('k') | xfa/src/fdp/include/fde_xml.h » ('j') | no next file with comments »