diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-14 11:52:07 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-14 18:12:34 +0000 |
| commit | f528eee136a602643a7777d87a2cce52cf83f38a (patch) | |
| tree | 94643b8f0b26a8cd61437db4b9867b9a60a00ef8 /fpdfsdk/pdfwindow/PWL_Caret.cpp | |
| parent | 22da8c268d2228203b40a8c73a2d3f6c25fc9acc (diff) | |
| download | pdfium-f528eee136a602643a7777d87a2cce52cf83f38a.tar.xz | |
Reland "Convert CFX_FloatPoint to CFX_PointF"
This CL updates the CFX_FloatPoint Cl to accommodate for the Origin CL being
reverted.
Change-Id: I345fe1117938a49ad9ee5f310fe7b5e21d9f1948
Reviewed-on: https://pdfium-review.googlesource.com/2697
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_Caret.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/PWL_Caret.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Caret.cpp b/fpdfsdk/pdfwindow/PWL_Caret.cpp index 6636170e81..06c8e31ce7 100644 --- a/fpdfsdk/pdfwindow/PWL_Caret.cpp +++ b/fpdfsdk/pdfwindow/PWL_Caret.cpp @@ -14,6 +14,8 @@ #define PWL_CARET_FLASHINTERVAL 500 +PWL_CARET_INFO::PWL_CARET_INFO() : bVisible(false) {} + CPWL_Caret::CPWL_Caret() : m_bFlash(false), m_fWidth(0.4f), m_nDelay(0) {} CPWL_Caret::~CPWL_Caret() {} @@ -23,7 +25,7 @@ CFX_ByteString CPWL_Caret::GetClassName() const { } void CPWL_Caret::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) { - GetCaretApp(sAppStream, CFX_FloatPoint(0.0f, 0.0f)); + GetCaretApp(sAppStream, CFX_PointF()); } void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice, @@ -60,7 +62,7 @@ void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice, } void CPWL_Caret::GetCaretApp(CFX_ByteTextBuf& sAppStream, - const CFX_FloatPoint& ptOffset) { + const CFX_PointF& ptOffset) { if (IsVisible() && m_bFlash) { CFX_ByteTextBuf sCaret; @@ -85,7 +87,7 @@ void CPWL_Caret::GetCaretApp(CFX_ByteTextBuf& sAppStream, } CFX_ByteString CPWL_Caret::GetCaretAppearanceStream( - const CFX_FloatPoint& ptOffset) { + const CFX_PointF& ptOffset) { CFX_ByteTextBuf sCaret; GetCaretApp(sCaret, ptOffset); return sCaret.MakeString(); @@ -106,8 +108,8 @@ CFX_FloatRect CPWL_Caret::GetCaretRect() const { } void CPWL_Caret::SetCaret(bool bVisible, - const CFX_FloatPoint& ptHead, - const CFX_FloatPoint& ptFoot) { + const CFX_PointF& ptHead, + const CFX_PointF& ptFoot) { if (bVisible) { if (IsVisible()) { if (m_ptHead != ptHead || m_ptFoot != ptFoot) { @@ -126,8 +128,8 @@ void CPWL_Caret::SetCaret(bool bVisible, Move(m_rcInvalid, false, true); } } else { - m_ptHead = CFX_FloatPoint(); - m_ptFoot = CFX_FloatPoint(); + m_ptHead = CFX_PointF(); + m_ptFoot = CFX_PointF(); m_bFlash = false; if (IsVisible()) { EndTimer(); |