diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /xfa/src/fdp/include/fde_tto.h | |
parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'xfa/src/fdp/include/fde_tto.h')
-rw-r--r-- | xfa/src/fdp/include/fde_tto.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/xfa/src/fdp/include/fde_tto.h b/xfa/src/fdp/include/fde_tto.h index 8b4d1d4787..ec27490cfd 100644 --- a/xfa/src/fdp/include/fde_tto.h +++ b/xfa/src/fdp/include/fde_tto.h @@ -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, 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 CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Size &size) = 0;
+ virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) = 0;
+ virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_Rect &rect) = 0;
+ virtual void CalcSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) = 0;
+ virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, int32_t x, int32_t y) = 0;
+ virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;
+ virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_Rect &rect) = 0;
+ virtual void DrawText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;
virtual void SetLogicClipRect(const CFX_RectF &rtClip) = 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 void CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_SizeF &size) = 0;
+ virtual void CalcLogicSize(const FX_WCHAR* pwsStr, int32_t iLength, CFX_RectF &rect) = 0;
+ virtual void DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y) = 0;
+ virtual void DrawLogicText(const FX_WCHAR* pwsStr, int32_t iLength, const CFX_RectF &rect) = 0;
virtual int32_t GetTotalLines() = 0;
};
#endif
|