diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-21 17:21:08 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-22 01:32:00 +0000 |
| commit | 60fd9fc63744419a760201af596515d411b7e194 (patch) | |
| tree | 8e4d8f3b2571bf0061af977f005bd65199fa0043 | |
| parent | 6eec1c45c9c6e0812950d55ae88340cf41bc243a (diff) | |
| download | pdfium-60fd9fc63744419a760201af596515d411b7e194.tar.xz | |
Convert OutputSelectedRect to take a rect
This updates the CPDFSDK_FormFillEnvironment::OutputSelectedRect to match to
CFX_SystemHandler::OutputSelectedRect method.
Change-Id: Ia07c408533a4423cf81095c5467c9ee82a25988c
Reviewed-on: https://pdfium-review.googlesource.com/2815
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
| -rw-r--r-- | fpdfsdk/cfx_systemhandler.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.cpp | 14 | ||||
| -rw-r--r-- | fpdfsdk/cpdfsdk_formfillenvironment.h | 6 |
3 files changed, 10 insertions, 13 deletions
diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index 14d772952a..b6dc19d48f 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp @@ -68,7 +68,8 @@ void CFX_SystemHandler::OutputSelectedRect(CFFL_FormFiller* pFormFiller, UnderlyingPageType* pPage = pAnnot->GetUnderlyingPage(); ASSERT(pPage); - m_pFormFillEnv->OutputSelectedRect(pPage, ptA.x, ptB.y, ptB.x, ptA.y); + m_pFormFillEnv->OutputSelectedRect(pPage, + CFX_FloatRect(ptA.x, ptA.y, ptB.x, ptB.y)); } bool CFX_SystemHandler::IsSelectionImplemented() const { diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp index 4aae48c828..4ef766d9f8 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp +++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp @@ -240,13 +240,13 @@ void CPDFSDK_FormFillEnvironment::Invalidate(FPDF_PAGE page, } } -void CPDFSDK_FormFillEnvironment::OutputSelectedRect(FPDF_PAGE page, - double left, - double top, - double right, - double bottom) { - if (m_pInfo && m_pInfo->FFI_OutputSelectedRect) - m_pInfo->FFI_OutputSelectedRect(m_pInfo, page, left, top, right, bottom); +void CPDFSDK_FormFillEnvironment::OutputSelectedRect( + FPDF_PAGE page, + const CFX_FloatRect& rect) { + if (m_pInfo && m_pInfo->FFI_OutputSelectedRect) { + m_pInfo->FFI_OutputSelectedRect(m_pInfo, page, rect.left, rect.top, + rect.right, rect.bottom); + } } void CPDFSDK_FormFillEnvironment::SetCursor(int nCursorType) { diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index b180e98104..eead8734f1 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -69,11 +69,7 @@ class CPDFSDK_FormFillEnvironment bool ProcOpenAction(); void Invalidate(FPDF_PAGE page, const FX_RECT& rect); - void OutputSelectedRect(FPDF_PAGE page, - double left, - double top, - double right, - double bottom); + void OutputSelectedRect(FPDF_PAGE page, const CFX_FloatRect& rect); void SetCursor(int nCursorType); int SetTimer(int uElapse, TimerCallback lpTimerFunc); |