summaryrefslogtreecommitdiff
path: root/core/include/fpdfdoc/fpdf_doc.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-12-10 15:34:55 -0800
committerTom Sepez <tsepez@chromium.org>2015-12-10 15:34:55 -0800
commit60d909e9d4444b2b8582275624ee97734d331a38 (patch)
tree6a884e5dd0c785c141919531033de7e2fc5b0e01 /core/include/fpdfdoc/fpdf_doc.h
parent33c8c7602f8981c32d37a9b2e25496401e914391 (diff)
downloadpdfium-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 'core/include/fpdfdoc/fpdf_doc.h')
-rw-r--r--core/include/fpdfdoc/fpdf_doc.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 3922e1c867..75150eb2f6 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -402,19 +402,19 @@ class CPDF_Annot : public CFX_PrivateData {
FX_BOOL DrawAppearance(const CPDF_Page* pPage,
CFX_RenderDevice* pDevice,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
AppearanceMode mode,
const CPDF_RenderOptions* pOptions);
FX_BOOL DrawInContext(const CPDF_Page* pPage,
const CPDF_RenderContext* pContext,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
AppearanceMode mode);
void ClearCachedAP();
void DrawBorder(CFX_RenderDevice* pDevice,
- const CFX_AffineMatrix* pUser2Device,
+ const CFX_Matrix* pUser2Device,
const CPDF_RenderOptions* pOptions);
CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode);
@@ -437,7 +437,7 @@ class CPDF_AnnotList {
void DisplayAnnots(const CPDF_Page* pPage,
CPDF_RenderContext* pContext,
FX_BOOL bPrinting,
- CFX_AffineMatrix* pMatrix,
+ CFX_Matrix* pMatrix,
FX_BOOL bShowWidget,
CPDF_RenderOptions* pOptions) {
DisplayAnnots(pPage, nullptr, pContext, bPrinting, pMatrix,
@@ -447,7 +447,7 @@ class CPDF_AnnotList {
CFX_RenderDevice* pDevice,
CPDF_RenderContext* pContext,
FX_BOOL bPrinting,
- CFX_AffineMatrix* pMatrix,
+ CFX_Matrix* pMatrix,
FX_DWORD dwAnnotFlags,
CPDF_RenderOptions* pOptions,
FX_RECT* pClipRect);
@@ -461,7 +461,7 @@ class CPDF_AnnotList {
CFX_RenderDevice* pDevice,
CPDF_RenderContext* pContext,
FX_BOOL bPrinting,
- CFX_AffineMatrix* pMatrix,
+ CFX_Matrix* pMatrix,
FX_BOOL bWidget,
CPDF_RenderOptions* pOptions,
FX_RECT* clip_rect);
@@ -517,7 +517,7 @@ class CPDF_DefaultAppearance {
CFX_ByteString GetTextMatrixString();
- CFX_AffineMatrix GetTextMatrix();
+ CFX_Matrix GetTextMatrix();
protected:
CFX_ByteString m_csDA;
@@ -915,7 +915,7 @@ class CPDF_FormControl {
CFX_FloatRect GetRect() const;
void DrawControl(CFX_RenderDevice* pDevice,
- CFX_AffineMatrix* pMatrix,
+ CFX_Matrix* pMatrix,
CPDF_Page* pPage,
CPDF_Annot::AppearanceMode mode,
const CPDF_RenderOptions* pOptions = NULL);