summaryrefslogtreecommitdiff
path: root/fpdfsdk/pdfwindow/PWL_Caret.h
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2017-02-14 14:58:49 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-02-14 14:59:09 +0000
commit92a32db931c1303388158f8a9e045e922d0b8dfa (patch)
tree5c6c05ffb40c1bb2653b415842537f7043bd6407 /fpdfsdk/pdfwindow/PWL_Caret.h
parent4797c4240cb9e2d8cd36c583d46cd52ff94af95d (diff)
downloadpdfium-92a32db931c1303388158f8a9e045e922d0b8dfa.tar.xz
Revert "Convert CFX_FloatPoint to CFX_PointF"
This reverts commit 4797c4240cb9e2d8cd36c583d46cd52ff94af95d. Reason for revert: Reverting chain to see if fixes Chrome roll. Original change's description: > Convert CFX_FloatPoint to CFX_PointF > > The two classes store the same information, remove the CFX_FloatPoint variant. > > Change-Id: Ie598c2ba5af04fb2bb3347dd48c30fd5e4845e62 > Reviewed-on: https://pdfium-review.googlesource.com/2612 > Commit-Queue: dsinclair <dsinclair@chromium.org> > Reviewed-by: Tom Sepez <tsepez@chromium.org> > TBR=tsepez@chromium.org,dsinclair@chromium.org,pdfium-reviews@googlegroups.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ia42074e706983c62d2e57497c3079b3c338343a3 Reviewed-on: https://pdfium-review.googlesource.com/2694 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/PWL_Caret.h')
-rw-r--r--fpdfsdk/pdfwindow/PWL_Caret.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Caret.h b/fpdfsdk/pdfwindow/PWL_Caret.h
index 60ebbdc8e1..ccee96109e 100644
--- a/fpdfsdk/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/pdfwindow/PWL_Caret.h
@@ -11,11 +11,11 @@
struct PWL_CARET_INFO {
public:
- PWL_CARET_INFO();
+ PWL_CARET_INFO() : bVisible(false) {}
bool bVisible;
- CFX_PointF ptHead;
- CFX_PointF ptFoot;
+ CFX_FloatPoint ptHead;
+ CFX_FloatPoint ptFoot;
};
class CPWL_Caret : public CPWL_Wnd {
@@ -33,18 +33,18 @@ class CPWL_Caret : public CPWL_Wnd {
void TimerProc() override;
void SetCaret(bool bVisible,
- const CFX_PointF& ptHead,
- const CFX_PointF& ptFoot);
- CFX_ByteString GetCaretAppearanceStream(const CFX_PointF& ptOffset);
+ const CFX_FloatPoint& ptHead,
+ const CFX_FloatPoint& ptFoot);
+ CFX_ByteString GetCaretAppearanceStream(const CFX_FloatPoint& ptOffset);
void SetInvalidRect(CFX_FloatRect rc) { m_rcInvalid = rc; }
private:
- void GetCaretApp(CFX_ByteTextBuf& sAppStream, const CFX_PointF& ptOffset);
+ void GetCaretApp(CFX_ByteTextBuf& sAppStream, const CFX_FloatPoint& ptOffset);
CFX_FloatRect GetCaretRect() const;
bool m_bFlash;
- CFX_PointF m_ptHead;
- CFX_PointF m_ptFoot;
+ CFX_FloatPoint m_ptHead;
+ CFX_FloatPoint m_ptFoot;
FX_FLOAT m_fWidth;
int32_t m_nDelay;
CFX_FloatRect m_rcInvalid;