diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-26 13:09:42 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-26 13:09:42 -0800 |
| commit | 3b8fdd34bdf57ec45291b77008a43249f838efcb (patch) | |
| tree | b65090a7c1fbedcda6499c3be4ffcaf8453e9e11 /fpdfsdk/src/fpdfxfa | |
| parent | 8ba5b59356d506d3b9e976e7422e69bbd5bec8d6 (diff) | |
| download | pdfium-3b8fdd34bdf57ec45291b77008a43249f838efcb.tar.xz | |
Replace CPDF_Rect and CPDF_Point with CFX types.
Too many rectangle types. Remove CPDF_Rect #define, and
make an equivalent point type in CFX, but stop short of
consolidating the N different forms of rectangles in CFX.
Also banish PDF_ClipFloat to the one .cpp file that needs it,
since it was in the vicinity of the .h file changes.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1740923003 .
Diffstat (limited to 'fpdfsdk/src/fpdfxfa')
| -rw-r--r-- | fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index 2baef4c21b..f9bf170554 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -192,7 +192,7 @@ CPDFSDK_Document* CPDFXFA_Document::GetSDKDocument( } void CPDFXFA_Document::FXRect2PDFRect(const CFX_RectF& fxRectF, - CPDF_Rect& pdfRect) { + CFX_FloatRect& pdfRect) { pdfRect.left = fxRectF.left; pdfRect.top = fxRectF.bottom(); pdfRect.right = fxRectF.right(); @@ -220,7 +220,7 @@ void CPDFXFA_Document::InvalidateRect(IXFA_PageView* pPageView, if (m_iDocType != DOCTYPE_DYNAMIC_XFA) return; - CPDF_Rect rcPage; + CFX_FloatRect rcPage; FXRect2PDFRect(rt, rcPage); CPDFXFA_Page* pPage = GetPage(pPageView); @@ -285,7 +285,7 @@ void CPDFXFA_Document::DisplayCaret(IXFA_Widget* hWidget, if (pPage == NULL) return; - CPDF_Rect rcCaret; + CFX_FloatRect rcCaret; FXRect2PDFRect(*pRtAnchor, rcCaret); CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); @@ -327,7 +327,7 @@ FX_BOOL CPDFXFA_Document::GetPopupPos(IXFA_Widget* hWidget, FS_RECTF pageViewRect; pEnv->FFI_GetPageViewRect(pPage, pageViewRect); - CPDF_Rect rcAnchor; + CFX_FloatRect rcAnchor; rcAnchor.left = rtAnchor.left; rcAnchor.top = rtAnchor.bottom(); |