diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-10 15:34:55 -0800 |
| commit | 60d909e9d4444b2b8582275624ee97734d331a38 (patch) | |
| tree | 6a884e5dd0c785c141919531033de7e2fc5b0e01 /fpdfsdk/include/fsdk_mgr.h | |
| parent | 33c8c7602f8981c32d37a9b2e25496401e914391 (diff) | |
| download | pdfium-60d909e9d4444b2b8582275624ee97734d331a38.tar.xz | |
Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix
Review URL: https://codereview.chromium.org/1513363002 .
(cherry picked from commit f32c969bce6743fca1e7ff796b54a1692d26d7f0)
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1519693002 .
Diffstat (limited to 'fpdfsdk/include/fsdk_mgr.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_mgr.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 385cfdbbff..d0da678d34 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -567,12 +567,12 @@ class CPDFSDK_PageView final { #ifdef PDF_ENABLE_XFA void PageView_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions, const FX_RECT& pClip); #else // PDF_ENABLE_XFA void PageView_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions); #endif // PDF_ENABLE_XFA @@ -626,7 +626,7 @@ class CPDFSDK_PageView final { const CPDF_Point& point, int nFlag); bool IsValidAnnot(const CPDF_Annot* p) const; - void GetCurrentMatrix(CPDF_Matrix& matrix) { matrix = m_curMatrix; } + void GetCurrentMatrix(CFX_Matrix& matrix) { matrix = m_curMatrix; } void UpdateRects(CFX_RectArray& rects); void UpdateView(CPDFSDK_Annot* pAnnot); const std::vector<CPDFSDK_Annot*>& GetAnnotList() const { @@ -647,7 +647,7 @@ class CPDFSDK_PageView final { void PageView_OnHighlightFormFields(CFX_RenderDevice* pDevice, CPDFSDK_Widget* pWidget); - CPDF_Matrix m_curMatrix; + CFX_Matrix m_curMatrix; UnderlyingPageType* m_page; nonstd::unique_ptr<CPDF_AnnotList> m_pAnnotList; std::vector<CPDFSDK_Annot*> m_fxAnnotArray; |