From f32c969bce6743fca1e7ff796b54a1692d26d7f0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 10 Dec 2015 14:49:23 -0800 Subject: Remove CFX_AffineMatrix/CPDF_Matrix These are synonyms for CFX_Matrix. Nothing but sed and manual deletion of 2 #defines in fpdf_parser.h and fx_coordinates.h R=thestig@chromium.org Review URL: https://codereview.chromium.org/1513363002 . --- fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp') diff --git a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp index e578f9b860..f7c1ef12fd 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp @@ -95,9 +95,9 @@ void CPWL_ListCtrl::ResetAll(FX_BOOL bMove, int32_t nStart) { FX_FLOAT fLeft = pChild->GetItemLeftMargin(); FX_FLOAT fRight = pChild->GetItemRightMargin(); - pChild->SetChildMatrix(CPDF_Matrix(1, 0, 0, 1, - rcClient.left - m_ptScroll.x, - rcClient.top - m_ptScroll.y)); + pChild->SetChildMatrix(CFX_Matrix(1, 0, 0, 1, + rcClient.left - m_ptScroll.x, + rcClient.top - m_ptScroll.y)); if (bMove) { FX_FLOAT fItemHeight = pChild->GetItemHeight(fWidth - fLeft - fRight); @@ -138,7 +138,7 @@ void CPWL_ListCtrl::RePosChildWnd() { } void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice, - CPDF_Matrix* pUser2Device) { + CFX_Matrix* pUser2Device) { pDevice->SaveState(); CPDF_Rect rcClient = GetClientRect(); CPDF_Rect rcTemp = rcClient; @@ -152,7 +152,7 @@ void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice, if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) { CPDF_Rect rcChild = pChild->ChildToParent(pChild->GetWindowRect()); if (!(rcChild.top < rcClient.bottom || rcChild.bottom > rcClient.top)) { - CPDF_Matrix mt = pChild->GetChildMatrix(); + CFX_Matrix mt = pChild->GetChildMatrix(); if (mt.IsIdentity()) { pChild->DrawAppearance(pDevice, pUser2Device); } else { -- cgit v1.2.3