diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-14 14:43:42 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 19:05:58 +0000 |
| commit | 05df075154a832fcb476e1dfcfb865722d0ea898 (patch) | |
| tree | b8b771b62adae74d5d5ee561db75d10de3a848bf /xfa/fde/tto/fde_textout.h | |
| parent | 6b94f01d1c8ad386d497428c7397b1a99614aeba (diff) | |
| download | pdfium-05df075154a832fcb476e1dfcfb865722d0ea898.tar.xz | |
Replace FX_FLOAT with underlying float type.
Change-Id: I158b7d80b0ec28b742a9f2d5a96f3dde7fb3ab56
Reviewed-on: https://pdfium-review.googlesource.com/3031
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fde/tto/fde_textout.h')
| -rw-r--r-- | xfa/fde/tto/fde_textout.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/tto/fde_textout.h index 224a584a4e..bbc796d7ac 100644 --- a/xfa/fde/tto/fde_textout.h +++ b/xfa/fde/tto/fde_textout.h @@ -79,33 +79,30 @@ class CFDE_TextOut { ~CFDE_TextOut(); void SetFont(const CFX_RetainPtr<CFGAS_GEFont>& pFont); - void SetFontSize(FX_FLOAT fFontSize); + void SetFontSize(float fFontSize); void SetTextColor(FX_ARGB color); void SetStyles(uint32_t dwStyles); - void SetTabWidth(FX_FLOAT fTabWidth); + void SetTabWidth(float fTabWidth); void SetEllipsisString(const CFX_WideString& wsEllipsis); void SetParagraphBreakChar(wchar_t wch); void SetAlignment(int32_t iAlignment); - void SetLineSpace(FX_FLOAT fLineSpace); + void SetLineSpace(float fLineSpace); void SetDIBitmap(CFX_DIBitmap* pDIB); void SetRenderDevice(CFX_RenderDevice* pDevice); void SetClipRect(const CFX_Rect& rtClip); void SetClipRect(const CFX_RectF& rtClip); void SetMatrix(const CFX_Matrix& matrix); - void SetLineBreakTolerance(FX_FLOAT fTolerance); + void SetLineBreakTolerance(float fTolerance); void DrawText(const wchar_t* pwsStr, int32_t iLength, int32_t x, int32_t y); - void DrawText(const wchar_t* pwsStr, int32_t iLength, FX_FLOAT x, FX_FLOAT y); + void DrawText(const wchar_t* pwsStr, int32_t iLength, float x, float y); void DrawText(const wchar_t* pwsStr, int32_t iLength, const CFX_Rect& rect); void DrawText(const wchar_t* pwsStr, int32_t iLength, const CFX_RectF& rect); void SetLogicClipRect(const CFX_RectF& rtClip); void CalcLogicSize(const wchar_t* pwsStr, int32_t iLength, CFX_SizeF& size); void CalcLogicSize(const wchar_t* pwsStr, int32_t iLength, CFX_RectF& rect); - void DrawLogicText(const wchar_t* pwsStr, - int32_t iLength, - FX_FLOAT x, - FX_FLOAT y); + void DrawLogicText(const wchar_t* pwsStr, int32_t iLength, float x, float y); void DrawLogicText(const wchar_t* pwsStr, int32_t iLength, const CFX_RectF& rect); @@ -114,9 +111,9 @@ class CFDE_TextOut { protected: void CalcTextSize(const wchar_t* pwsStr, int32_t iLength, CFX_RectF& rect); bool RetrieveLineWidth(CFX_BreakType dwBreakStatus, - FX_FLOAT& fStartPos, - FX_FLOAT& fWidth, - FX_FLOAT& fHeight); + float& fStartPos, + float& fWidth, + float& fHeight); void SetLineWidth(CFX_RectF& rect); void DrawText(const wchar_t* pwsStr, int32_t iLength, @@ -146,10 +143,10 @@ class CFDE_TextOut { std::unique_ptr<CFX_TxtBreak> m_pTxtBreak; CFX_RetainPtr<CFGAS_GEFont> m_pFont; - FX_FLOAT m_fFontSize; - FX_FLOAT m_fLineSpace; - FX_FLOAT m_fLinePos; - FX_FLOAT m_fTolerance; + float m_fFontSize; + float m_fLineSpace; + float m_fLinePos; + float m_fTolerance; int32_t m_iAlignment; int32_t m_iTxtBkAlignment; std::vector<int32_t> m_CharWidths; |