Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
@@ skipping 77 matching lines @@
 
   if (nStart - 1 >= 0 && nStart - 1 < m_aChildren.GetSize())
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(nStart - 1))
       fy = pChild->GetWindowRect().bottom - m_fItemSpace;
 
   for (int32_t i = nStart, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
       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);
         pChild->Move(CPDF_Rect(fLeft, fy - fItemHeight, fWidth - fRight, fy),
                      TRUE, FALSE);
         fy -= fItemHeight;
         fy -= m_fItemSpace;
       }
     }
   }
@@ skipping 20 matching lines @@
 
 void CPWL_ListCtrl::SetBottomSpace(FX_FLOAT fSpace) {
   m_fBottomSpace = fSpace;
 }
 
 void CPWL_ListCtrl::RePosChildWnd() {
   ResetFace();
 }
 
 void CPWL_ListCtrl::DrawChildAppearance(CFX_RenderDevice* pDevice,
-                                        CPDF_Matrix* pUser2Device) {
+                                        CFX_Matrix* pUser2Device) {
   pDevice->SaveState();
   CPDF_Rect rcClient = GetClientRect();
   CPDF_Rect rcTemp = rcClient;
   pUser2Device->TransformRect(rcTemp);
   FX_RECT rcClip((int32_t)rcTemp.left, (int32_t)rcTemp.bottom,
                  (int32_t)rcTemp.right, (int32_t)rcTemp.top);
 
   pDevice->SetClip_Rect(&rcClip);
 
   for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
     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 {
           mt.Concat(*pUser2Device);
           pChild->DrawAppearance(pDevice, &mt);
         }
       }
     }
   }
 
@@ skipping 33 matching lines @@
 }
 
 CPDF_Rect CPWL_ListCtrl::OutToIn(const CPDF_Rect& rect) const {
   CPDF_Rect rcClient = GetClientRect();
 
   return CPDF_Rect(rect.left - rcClient.left + m_ptScroll.x,
                    rect.bottom - rcClient.top + m_ptScroll.y,
                    rect.right - rcClient.left + m_ptScroll.x,
                    rect.top - rcClient.top + m_ptScroll.y);
 }