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/src/fxedit | |
| 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/src/fxedit')
| -rw-r--r-- | fpdfsdk/src/fxedit/fxet_pageobjs.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp index 88f97da7f8..fefa42bdfd 100644 --- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp @@ -29,7 +29,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice, const CPDF_Point& pt, CPDF_Font* pFont, FX_FLOAT fFontSize, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, const CFX_ByteString& str, FX_ARGB crTextFill, FX_ARGB crTextStroke, @@ -39,7 +39,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice, if (pFont) { if (nHorzScale != 100) { - CPDF_Matrix mt(nHorzScale / 100.0f, 0, 0, 1, 0, 0); + CFX_Matrix mt(nHorzScale / 100.0f, 0, 0, 1, 0, 0); mt.Concat(*pUser2Device); CPDF_RenderOptions ro; @@ -85,7 +85,7 @@ static void DrawTextString(CFX_RenderDevice* pDevice, } void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, FX_COLORREF color, const CPDF_Rect& rcClip, @@ -138,7 +138,7 @@ void IFX_Edit::DrawUnderline(CFX_RenderDevice* pDevice, } void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, FX_COLORREF crTextFill, FX_COLORREF crTextStroke, @@ -277,7 +277,7 @@ void IFX_Edit::DrawEdit(CFX_RenderDevice* pDevice, } void IFX_Edit::DrawRichEdit(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device, + CFX_Matrix* pUser2Device, IFX_Edit* pEdit, const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, |