diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-21 14:27:59 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-21 20:44:29 +0000 |
| commit | b45ea1fce52d93615470bab8b671cba5907fb01e (patch) | |
| tree | 15153c437a253f73b3f5bb154a294ace77fe2c6d /core/fpdfdoc | |
| parent | 37a35df8c878d6e21a62ce0dfd2d480997d9e86c (diff) | |
| download | pdfium-b45ea1fce52d93615470bab8b671cba5907fb01e.tar.xz | |
Convert CFWL messages to use CFX_PointF
This Cl updates the various CFWL_Message classes to take CFX_PointF instead of
x,y values.
Change-Id: I5d9d01d68be64fc9e69c04574994c01286ad24e1
Reviewed-on: https://pdfium-review.googlesource.com/2811
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 7 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_interform.h | 3 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_linklist.cpp | 6 | ||||
| -rw-r--r-- | core/fpdfdoc/cpdf_linklist.h | 3 |
4 files changed, 7 insertions, 12 deletions
diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index 127e542227..d9f0db9747 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -900,8 +900,8 @@ CPDF_FormField* CPDF_InterForm::GetFieldByDict( } CPDF_FormControl* CPDF_InterForm::GetControlAtPoint(CPDF_Page* pPage, - FX_FLOAT pdf_x, - FX_FLOAT pdf_y, + const CFX_PointF& point, + int* z_order) const { CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArrayFor("Annots"); if (!pAnnotList) @@ -918,8 +918,7 @@ CPDF_FormControl* CPDF_InterForm::GetControlAtPoint(CPDF_Page* pPage, continue; CPDF_FormControl* pControl = it->second.get(); - CFX_FloatRect rect = pControl->GetRect(); - if (!rect.Contains(pdf_x, pdf_y)) + if (!pControl->GetRect().Contains(point)) continue; if (z_order) diff --git a/core/fpdfdoc/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h index a42c4cef84..cbaaa7bc2d 100644 --- a/core/fpdfdoc/cpdf_interform.h +++ b/core/fpdfdoc/cpdf_interform.h @@ -55,8 +55,7 @@ class CPDF_InterForm { CPDF_FormField* GetFieldByDict(CPDF_Dictionary* pFieldDict) const; CPDF_FormControl* GetControlAtPoint(CPDF_Page* pPage, - FX_FLOAT pdf_x, - FX_FLOAT pdf_y, + const CFX_PointF& point, int* z_order) const; CPDF_FormControl* GetControlByDict(const CPDF_Dictionary* pWidgetDict) const; diff --git a/core/fpdfdoc/cpdf_linklist.cpp b/core/fpdfdoc/cpdf_linklist.cpp index 2d8f7e2339..0620dbf32b 100644 --- a/core/fpdfdoc/cpdf_linklist.cpp +++ b/core/fpdfdoc/cpdf_linklist.cpp @@ -30,8 +30,7 @@ const std::vector<CPDF_Dictionary*>* CPDF_LinkList::GetPageLinks( } CPDF_Link CPDF_LinkList::GetLinkAtPoint(CPDF_Page* pPage, - FX_FLOAT pdf_x, - FX_FLOAT pdf_y, + const CFX_PointF& point, int* z_order) { const std::vector<CPDF_Dictionary*>* pPageLinkList = GetPageLinks(pPage); if (!pPageLinkList) @@ -44,8 +43,7 @@ CPDF_Link CPDF_LinkList::GetLinkAtPoint(CPDF_Page* pPage, continue; CPDF_Link link(pAnnot); - CFX_FloatRect rect = link.GetRect(); - if (!rect.Contains(pdf_x, pdf_y)) + if (!link.GetRect().Contains(point)) continue; if (z_order) diff --git a/core/fpdfdoc/cpdf_linklist.h b/core/fpdfdoc/cpdf_linklist.h index 21d69fdd1d..129790f846 100644 --- a/core/fpdfdoc/cpdf_linklist.h +++ b/core/fpdfdoc/cpdf_linklist.h @@ -22,8 +22,7 @@ class CPDF_LinkList { ~CPDF_LinkList(); CPDF_Link GetLinkAtPoint(CPDF_Page* pPage, - FX_FLOAT pdf_x, - FX_FLOAT pdf_y, + const CFX_PointF& point, int* z_order); private: |