summaryrefslogtreecommitdiff
path: root/fpdfsdk/pdfwindow/PWL_Wnd.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_Wnd.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_Wnd.h')
-rw-r--r--fpdfsdk/pdfwindow/PWL_Wnd.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
index 12b29aeb7e..dd4f321d8a 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -264,17 +264,17 @@ class CPWL_Wnd : public CPWL_TimerHandler {
virtual bool OnKeyDown(uint16_t nChar, uint32_t nFlag);
virtual bool OnKeyUp(uint16_t nChar, uint32_t nFlag);
virtual bool OnChar(uint16_t nChar, uint32_t nFlag);
- virtual bool OnLButtonDblClk(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnLButtonDown(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnMButtonDblClk(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnMButtonDown(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnMButtonUp(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnRButtonDown(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnRButtonUp(const CFX_PointF& point, uint32_t nFlag);
- virtual bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag);
+ virtual bool OnLButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnLButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnLButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnMButtonDblClk(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnMButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnMButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnRButtonDown(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag);
+ virtual bool OnMouseMove(const CFX_FloatPoint& point, uint32_t nFlag);
virtual bool OnMouseWheel(short zDelta,
- const CFX_PointF& point,
+ const CFX_FloatPoint& point,
uint32_t nFlag);
virtual void SetFocus();
@@ -308,7 +308,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
virtual CFX_FloatRect GetWindowRect() const;
virtual CFX_FloatRect GetClientRect() const;
- CFX_PointF GetCenterPoint() const;
+ CFX_FloatPoint GetCenterPoint() const;
int32_t GetBorderWidth() const;
bool IsVisible() const { return m_bVisible; }
bool HasFlag(uint32_t dwFlags) const;
@@ -320,8 +320,8 @@ class CPWL_Wnd : public CPWL_TimerHandler {
const CPWL_Dash& GetBorderDash() const;
void* GetAttachedData() const;
- bool WndHitTest(const CFX_PointF& point) const;
- bool ClientHitTest(const CFX_PointF& point) const;
+ bool WndHitTest(const CFX_FloatPoint& point) const;
+ bool ClientHitTest(const CFX_FloatPoint& point) const;
bool IsCaptureMouse() const;
const CPWL_Wnd* GetFocused() const;
@@ -341,9 +341,9 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void SetChildMatrix(const CFX_Matrix& mt);
CFX_Matrix GetWindowMatrix() const;
- virtual CFX_PointF ChildToParent(const CFX_PointF& point) const;
+ virtual CFX_FloatPoint ChildToParent(const CFX_FloatPoint& point) const;
virtual CFX_FloatRect ChildToParent(const CFX_FloatRect& rect) const;
- virtual CFX_PointF ParentToChild(const CFX_PointF& point) const;
+ virtual CFX_FloatPoint ParentToChild(const CFX_FloatPoint& point) const;
virtual CFX_FloatRect ParentToChild(const CFX_FloatRect& rect) const;
// those methods only implemented by listctrl item
@@ -389,7 +389,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
void InvalidateRectMove(const CFX_FloatRect& rcOld,
const CFX_FloatRect& rcNew);
- void PWLtoWnd(const CFX_PointF& point, int32_t& x, int32_t& y) const;
+ void PWLtoWnd(const CFX_FloatPoint& point, int32_t& x, int32_t& y) const;
FX_RECT PWLtoWnd(const CFX_FloatRect& rect) const;
bool IsWndCaptureMouse(const CPWL_Wnd* pWnd) const;