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_baseannot.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_baseannot.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseannot.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 59c9c79b4d..26de7aae95 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -22,7 +22,7 @@ class CPDFSDK_PageView; class CPDF_Annot; class CPDF_Page; class CPDF_Rect; -class CPDF_Matrix; +class CFX_Matrix; class CPDF_RenderOptions; class CFX_RenderDevice; @@ -94,7 +94,7 @@ class CPDFSDK_Annot { virtual CPDF_Rect GetRect() const { return CPDF_Rect(); } virtual void Annot_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions) {} UnderlyingPageType* GetUnderlyingPage(); @@ -135,7 +135,7 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { CPDF_Rect GetRect() const override; CPDF_Annot* GetPDFAnnot() const override; void Annot_OnDraw(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, CPDF_RenderOptions* pOptions) override; CPDF_Dictionary* GetAnnotDict() const; @@ -198,18 +198,18 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { virtual FX_BOOL IsAppearanceValid(); virtual FX_BOOL IsAppearanceValid(CPDF_Annot::AppearanceMode mode); virtual void DrawAppearance(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions); void DrawBorder(CFX_RenderDevice* pDevice, - const CPDF_Matrix* pUser2Device, + const CFX_Matrix* pUser2Device, const CPDF_RenderOptions* pOptions); void ClearCachedAP(); void WriteAppearance(const CFX_ByteString& sAPType, const CPDF_Rect& rcBBox, - const CPDF_Matrix& matrix, + const CFX_Matrix& matrix, const CFX_ByteString& sContents, const CFX_ByteString& sAPState = ""); |