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 .

14 files changed, 51 insertions, 51 deletions

diff --git a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
index adb296d8e1..d129c2c7d3 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp
@@ -33,7 +33,7 @@ void CPWL_Caret::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_Caret::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                    CPDF_Matrix* pUser2Device) {
+                                    CFX_Matrix* pUser2Device) {
   if (IsVisible() && m_bFlash) {
     CPDF_Rect rcRect = GetCaretRect();
     CPDF_Rect rcClip = GetClipRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
index 395f764872..71994ea27d 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp
@@ -143,7 +143,7 @@ void CPWL_CBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_CBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                       CPDF_Matrix* pUser2Device) {
+                                       CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   CPDF_Rect rectWnd = CPWL_Wnd::GetWindowRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index 29e7c2eea7..6d32b7270f 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -370,7 +370,7 @@ void CPWL_Edit::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                   CPDF_Matrix* pUser2Device) {
+                                   CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   CPDF_Rect rcClient = GetClientRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
index 0794be653c..1c69f18b9f 100644
--- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp
@@ -47,7 +47,7 @@ void CPWL_EditCtrl::OnCreated() {
 }
 
 FX_BOOL CPWL_EditCtrl::IsWndHorV() {
-  CPDF_Matrix mt = GetWindowMatrix();
+  CFX_Matrix mt = GetWindowMatrix();
   CPDF_Point point1(0, 1);
   CPDF_Point point2(1, 1);
 
diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
index 166b4e7ba1..61ad1f6913 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp
@@ -21,7 +21,7 @@ CFX_ByteString CPWL_Image::GetImageAppStream() {
 
   CFX_ByteString sAlias = GetImageAlias();
   CPDF_Rect rcPlate = GetClientRect();
-  CPDF_Matrix mt;
+  CFX_Matrix mt;
   mt.SetReverse(GetImageMatrix());
 
   FX_FLOAT fHScale = 1.0f;
@@ -72,14 +72,14 @@ void CPWL_Image::GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) {
   }
 }
 
-CPDF_Matrix CPWL_Image::GetImageMatrix() {
+CFX_Matrix CPWL_Image::GetImageMatrix() {
   if (m_pPDFStream) {
     if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) {
       return pDict->GetMatrix("Matrix");
     }
   }
 
-  return CPDF_Matrix();
+  return CFX_Matrix();
 }
 
 CFX_ByteString CPWL_Image::GetImageAlias() {
diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
index cc8b352af1..6a627d7e92 100644
--- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp
@@ -33,7 +33,7 @@ FX_FLOAT CPWL_IconList_Item::GetItemHeight(FX_FLOAT fLimitWidth) {
 }
 
 void CPWL_IconList_Item::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                            CPDF_Matrix* pUser2Device) {
+                                            CFX_Matrix* pUser2Device) {
   CPDF_Rect rcClient = GetClientRect();
 
   if (m_bSelected) {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Label.cpp b/fpdfsdk/src/pdfwindow/PWL_Label.cpp
index 4beeada721..23be536766 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Label.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Label.cpp
@@ -86,7 +86,7 @@ void CPWL_Label::SetParamByFlag() {
 }
 
 void CPWL_Label::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                    CPDF_Matrix* pUser2Device) {
+                                    CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   GetClientRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
index 229c1dd81e..9b62c471d7 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp
@@ -159,7 +159,7 @@ void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                      CPDF_Matrix* pUser2Device) {
+                                      CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   if (m_pList) {
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 {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
index 553a20f1dd..f15004dcd6 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp
@@ -75,7 +75,7 @@ void CPWL_Note_Options::SetText(const CFX_WideString& sText) {
 }
 
 void CPWL_Note_Options::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                           CPDF_Matrix* pUser2Device) {
+                                           CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   CPDF_Rect rcClient = GetClientRect();
@@ -246,7 +246,7 @@ CPWL_Note_LBBox::CPWL_Note_LBBox() {}
 CPWL_Note_LBBox::~CPWL_Note_LBBox() {}
 
 void CPWL_Note_LBBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                         CPDF_Matrix* pUser2Device) {
+                                         CFX_Matrix* pUser2Device) {
   CPDF_Rect rcClient = GetClientRect();
 
   CFX_GraphStateData gsd;
@@ -276,7 +276,7 @@ CPWL_Note_RBBox::CPWL_Note_RBBox() {}
 CPWL_Note_RBBox::~CPWL_Note_RBBox() {}
 
 void CPWL_Note_RBBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                         CPDF_Matrix* pUser2Device) {
+                                         CFX_Matrix* pUser2Device) {
   CPDF_Rect rcClient = GetClientRect();
 
   CFX_GraphStateData gsd;
@@ -310,7 +310,7 @@ void CPWL_Note_Icon::SetIconType(int32_t nType) {
 }
 
 void CPWL_Note_Icon::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                        CPDF_Matrix* pUser2Device) {
+                                        CFX_Matrix* pUser2Device) {
   CPWL_Utils::DrawIconAppStream(pDevice, pUser2Device, m_nType, GetClientRect(),
                                 GetBackgroundColor(), PWL_DEFAULT_BLACKCOLOR,
                                 GetTransparency());
@@ -324,7 +324,7 @@ CPWL_Note_CloseBox::CPWL_Note_CloseBox() : m_bMouseDown(FALSE) {}
 CPWL_Note_CloseBox::~CPWL_Note_CloseBox() {}
 
 void CPWL_Note_CloseBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                            CPDF_Matrix* pUser2Device) {
+                                            CFX_Matrix* pUser2Device) {
   CPWL_Button::DrawThisAppearance(pDevice, pUser2Device);
 
   CPDF_Rect rcClient = GetClientRect();
diff --git a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
index 94f14fd3b8..f4d4baf6e9 100644
--- a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp
@@ -244,7 +244,7 @@ void CPWL_SBButton::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_SBButton::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                       CPDF_Matrix* pUser2Device) {
+                                       CFX_Matrix* pUser2Device) {
   if (!IsVisible())
     return;
 
@@ -696,7 +696,7 @@ void CPWL_ScrollBar::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_ScrollBar::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                        CPDF_Matrix* pUser2Device) {
+                                        CFX_Matrix* pUser2Device) {
   CPDF_Rect rectWnd = GetWindowRect();
 
   if (IsVisible() && !rectWnd.IsEmpty()) {
diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
index f872bb4a62..dead655da0 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp
@@ -27,7 +27,7 @@ CFX_DIBSource* CPWL_Signature_Image::GetImage() {
 }
 
 void CPWL_Signature_Image::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                              CPDF_Matrix* pUser2Device) {
+                                              CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   if (m_pImage) {
@@ -166,7 +166,7 @@ void CPWL_Signature::CreateChildWnd(const PWL_CREATEPARAM& cp) {
 }
 
 void CPWL_Signature::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                        CPDF_Matrix* pUser2Device) {
+                                        CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   if (m_bFlagExist)
diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
index fafdf1e7cf..85593e11d4 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp
@@ -1389,7 +1389,7 @@ FX_COLORREF CPWL_Utils::PWLColorToFXColor(const CPWL_Color& color,
 }
 
 void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
-                              CPDF_Matrix* pUser2Device,
+                              CFX_Matrix* pUser2Device,
                               const CPDF_Rect& rect,
                               const FX_COLORREF& color) {
   CFX_PathData path;
@@ -1399,7 +1399,7 @@ void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice,
-                              CPDF_Matrix* pUser2Device,
+                              CFX_Matrix* pUser2Device,
                               const CPDF_Point* pPts,
                               int32_t nCount,
                               const FX_COLORREF& color) {
@@ -1414,7 +1414,7 @@ void CPWL_Utils::DrawFillArea(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice,
-                                CPDF_Matrix* pUser2Device,
+                                CFX_Matrix* pUser2Device,
                                 const CPDF_Rect& rect,
                                 const FX_COLORREF& color,
                                 FX_FLOAT fWidth) {
@@ -1429,7 +1429,7 @@ void CPWL_Utils::DrawStrokeRect(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice,
-                                CPDF_Matrix* pUser2Device,
+                                CFX_Matrix* pUser2Device,
                                 const CPDF_Point& ptMoveTo,
                                 const CPDF_Point& ptLineTo,
                                 const FX_COLORREF& color,
@@ -1446,7 +1446,7 @@ void CPWL_Utils::DrawStrokeLine(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
-                              CPDF_Matrix* pUser2Device,
+                              CFX_Matrix* pUser2Device,
                               const CPDF_Rect& rect,
                               const CPWL_Color& color,
                               int32_t nTransparancy) {
@@ -1455,7 +1455,7 @@ void CPWL_Utils::DrawFillRect(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice,
-                            CPDF_Matrix* pUser2Device,
+                            CFX_Matrix* pUser2Device,
                             FX_BOOL bVertical,
                             FX_BOOL bHorizontal,
                             CPDF_Rect rect,
@@ -1490,7 +1490,7 @@ void CPWL_Utils::DrawShadow(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Utils::DrawBorder(CFX_RenderDevice* pDevice,
-                            CPDF_Matrix* pUser2Device,
+                            CFX_Matrix* pUser2Device,
                             const CPDF_Rect& rect,
                             FX_FLOAT fWidth,
                             const CPWL_Color& color,
@@ -1697,7 +1697,7 @@ static void AddSpellCheckObj(CFX_PathData& PathData,
 }
 
 void CPWL_Utils::DrawEditSpellCheck(CFX_RenderDevice* pDevice,
-                                    CPDF_Matrix* pUser2Device,
+                                    CFX_Matrix* pUser2Device,
                                     IFX_Edit* pEdit,
                                     const CPDF_Rect& rcClip,
                                     const CPDF_Point& ptOffset,
@@ -1920,7 +1920,7 @@ CFX_ByteString CPWL_Utils::GetIconAppStream(int32_t nType,
 }
 
 void CPWL_Utils::DrawIconAppStream(CFX_RenderDevice* pDevice,
-                                   CPDF_Matrix* pUser2Device,
+                                   CFX_Matrix* pUser2Device,
                                    int32_t nType,
                                    const CPDF_Rect& rect,
                                    const CPWL_Color& crFill,
diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
index d8f3904021..002fc051af 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp
@@ -224,7 +224,7 @@ void CPWL_Wnd::Create(const PWL_CREATEPARAM& cp) {
     PWL_CREATEPARAM ccp = m_sPrivateParam;
 
     ccp.dwFlags &= 0xFFFF0000L;  // remove sub styles
-    ccp.mtChild = CPDF_Matrix(1, 0, 0, 1, 0, 0);
+    ccp.mtChild = CFX_Matrix(1, 0, 0, 1, 0, 0);
 
     CreateScrollBar(ccp);
     CreateChildWnd(ccp);
@@ -344,7 +344,7 @@ void CPWL_Wnd::GetChildAppearanceStream(CFX_ByteTextBuf& sAppStream) {
 }
 
 void CPWL_Wnd::DrawAppearance(CFX_RenderDevice* pDevice,
-                              CPDF_Matrix* pUser2Device) {
+                              CFX_Matrix* pUser2Device) {
   if (IsValid() && IsVisible()) {
     DrawThisAppearance(pDevice, pUser2Device);
     DrawChildAppearance(pDevice, pUser2Device);
@@ -352,7 +352,7 @@ void CPWL_Wnd::DrawAppearance(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Wnd::DrawThisAppearance(CFX_RenderDevice* pDevice,
-                                  CPDF_Matrix* pUser2Device) {
+                                  CFX_Matrix* pUser2Device) {
   CPDF_Rect rectWnd = GetWindowRect();
   if (!rectWnd.IsEmpty()) {
     if (HasFlag(PWS_BACKGROUND)) {
@@ -372,10 +372,10 @@ void CPWL_Wnd::DrawThisAppearance(CFX_RenderDevice* pDevice,
 }
 
 void CPWL_Wnd::DrawChildAppearance(CFX_RenderDevice* pDevice,
-                                   CPDF_Matrix* pUser2Device) {
+                                   CFX_Matrix* pUser2Device) {
   for (int32_t i = 0, sz = m_aChildren.GetSize(); i < sz; i++) {
     if (CPWL_Wnd* pChild = m_aChildren.GetAt(i)) {
-      CPDF_Matrix mt = pChild->GetChildMatrix();
+      CFX_Matrix mt = pChild->GetChildMatrix();
       if (mt.IsIdentity()) {
         pChild->DrawAppearance(pDevice, pUser2Device);
       } else {
@@ -918,8 +918,8 @@ void CPWL_Wnd::SetTransparency(int32_t nTransparency) {
   m_sPrivateParam.nTransparency = nTransparency;
 }
 
-CPDF_Matrix CPWL_Wnd::GetWindowMatrix() const {
-  CPDF_Matrix mt = GetChildToRoot();
+CFX_Matrix CPWL_Wnd::GetWindowMatrix() const {
+  CFX_Matrix mt = GetChildToRoot();
 
   if (IPWL_Provider* pProvider = GetProvider()) {
     mt.Concat(pProvider->GetWindowMatrix(GetAttachedData()));
@@ -930,7 +930,7 @@ CPDF_Matrix CPWL_Wnd::GetWindowMatrix() const {
 }
 
 void CPWL_Wnd::PWLtoWnd(const CPDF_Point& point, int32_t& x, int32_t& y) const {
-  CPDF_Matrix mt = GetWindowMatrix();
+  CFX_Matrix mt = GetWindowMatrix();
   CPDF_Point pt = point;
   mt.Transform(pt.x, pt.y);
   x = (int32_t)(pt.x + 0.5);
@@ -939,7 +939,7 @@ void CPWL_Wnd::PWLtoWnd(const CPDF_Point& point, int32_t& x, int32_t& y) const {
 
 FX_RECT CPWL_Wnd::PWLtoWnd(const CPDF_Rect& rect) const {
   CPDF_Rect rcTemp = rect;
-  CPDF_Matrix mt = GetWindowMatrix();
+  CFX_Matrix mt = GetWindowMatrix();
   mt.TransformRect(rcTemp);
   return FX_RECT((int32_t)(rcTemp.left + 0.5), (int32_t)(rcTemp.bottom + 0.5),
                  (int32_t)(rcTemp.right + 0.5), (int32_t)(rcTemp.top + 0.5));
@@ -950,7 +950,7 @@ FX_HWND CPWL_Wnd::GetAttachedHWnd() const {
 }
 
 CPDF_Point CPWL_Wnd::ChildToParent(const CPDF_Point& point) const {
-  CPDF_Matrix mt = GetChildMatrix();
+  CFX_Matrix mt = GetChildMatrix();
   if (mt.IsIdentity())
     return point;
 
@@ -960,7 +960,7 @@ CPDF_Point CPWL_Wnd::ChildToParent(const CPDF_Point& point) const {
 }
 
 CPDF_Rect CPWL_Wnd::ChildToParent(const CPDF_Rect& rect) const {
-  CPDF_Matrix mt = GetChildMatrix();
+  CFX_Matrix mt = GetChildMatrix();
   if (mt.IsIdentity())
     return rect;
 
@@ -970,7 +970,7 @@ CPDF_Rect CPWL_Wnd::ChildToParent(const CPDF_Rect& rect) const {
 }
 
 CPDF_Point CPWL_Wnd::ParentToChild(const CPDF_Point& point) const {
-  CPDF_Matrix mt = GetChildMatrix();
+  CFX_Matrix mt = GetChildMatrix();
   if (mt.IsIdentity())
     return point;
 
@@ -981,7 +981,7 @@ CPDF_Point CPWL_Wnd::ParentToChild(const CPDF_Point& point) const {
 }
 
 CPDF_Rect CPWL_Wnd::ParentToChild(const CPDF_Rect& rect) const {
-  CPDF_Matrix mt = GetChildMatrix();
+  CFX_Matrix mt = GetChildMatrix();
   if (mt.IsIdentity())
     return rect;
 
@@ -991,8 +991,8 @@ CPDF_Rect CPWL_Wnd::ParentToChild(const CPDF_Rect& rect) const {
   return rc;
 }
 
-CPDF_Matrix CPWL_Wnd::GetChildToRoot() const {
-  CPDF_Matrix mt(1, 0, 0, 1, 0, 0);
+CFX_Matrix CPWL_Wnd::GetChildToRoot() const {
+  CFX_Matrix mt(1, 0, 0, 1, 0, 0);
   if (HasFlag(PWS_CHILD)) {
     const CPWL_Wnd* pParent = this;
     while (pParent) {
@@ -1003,14 +1003,14 @@ CPDF_Matrix CPWL_Wnd::GetChildToRoot() const {
   return mt;
 }
 
-CPDF_Matrix CPWL_Wnd::GetChildMatrix() const {
+CFX_Matrix CPWL_Wnd::GetChildMatrix() const {
   if (HasFlag(PWS_CHILD))
     return m_sPrivateParam.mtChild;
 
-  return CPDF_Matrix(1, 0, 0, 1, 0, 0);
+  return CFX_Matrix(1, 0, 0, 1, 0, 0);
 }
 
-void CPWL_Wnd::SetChildMatrix(const CPDF_Matrix& mt) {
+void CPWL_Wnd::SetChildMatrix(const CFX_Matrix& mt) {
   m_sPrivateParam.mtChild = mt;
 }