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 .

8 files changed, 106 insertions, 108 deletions

diff --git a/xfa/src/fdp/src/fde/fde_gedevice.cpp b/xfa/src/fdp/src/fde/fde_gedevice.cpp
index 3910e65cc3..23da752e3b 100644
--- a/xfa/src/fdp/src/fde/fde_gedevice.cpp
+++ b/xfa/src/fdp/src/fde/fde_gedevice.cpp
@@ -124,7 +124,7 @@ FX_BOOL CFDE_FxgeDevice::DrawImage(CFX_DIBSource* pDib,
     dib2fxdev.Concat(*pDevMatrix);

   }

   void* handle = NULL;

-  m_pDevice->StartDIBits(pDib, 255, 0, (const CFX_AffineMatrix*)&dib2fxdev, 0,

+  m_pDevice->StartDIBits(pDib, 255, 0, (const CFX_Matrix*)&dib2fxdev, 0,

                          handle);

   while (m_pDevice->ContinueDIBits(handle, NULL)) {

   }

@@ -180,13 +180,13 @@ FX_BOOL CFDE_FxgeDevice::DrawString(IFDE_Brush* pBrush,
             pFxFont = (CFX_Font*)pCurFont->GetDevFont();

 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_

             FxFont.SetFace(pFxFont->GetFace());

-            m_pDevice->DrawNormalText(

-                iCurCount, pCurCP, &FxFont, pCache, -fFontSize,

-                (const CFX_AffineMatrix*)pMatrix, argb, FXTEXT_CLEARTYPE);

+            m_pDevice->DrawNormalText(iCurCount, pCurCP, &FxFont, pCache,

+                                      -fFontSize, (const CFX_Matrix*)pMatrix,

+                                      argb, FXTEXT_CLEARTYPE);

 #else

-            m_pDevice->DrawNormalText(

-                iCurCount, pCurCP, pFxFont, pCache, -fFontSize,

-                (const CFX_AffineMatrix*)pMatrix, argb, FXTEXT_CLEARTYPE);

+            m_pDevice->DrawNormalText(iCurCount, pCurCP, pFxFont, pCache,

+                                      -fFontSize, (const CFX_Matrix*)pMatrix,

+                                      argb, FXTEXT_CLEARTYPE);

 #endif

           }

           pCurFont = pSTFont;

@@ -203,14 +203,14 @@ FX_BOOL CFDE_FxgeDevice::DrawString(IFDE_Brush* pBrush,
         FxFont.SetFace(pFxFont->GetFace());

         FX_BOOL bRet = m_pDevice->DrawNormalText(

             iCurCount, pCurCP, &FxFont, pCache, -fFontSize,

-            (const CFX_AffineMatrix*)pMatrix, argb, FXTEXT_CLEARTYPE);

+            (const CFX_Matrix*)pMatrix, argb, FXTEXT_CLEARTYPE);

         FxFont.SetSubstFont(nullptr);

         FxFont.SetFace(nullptr);

         return bRet;

 #else

-        return m_pDevice->DrawNormalText(

-            iCurCount, pCurCP, pFxFont, pCache, -fFontSize,

-            (const CFX_AffineMatrix*)pMatrix, argb, FXTEXT_CLEARTYPE);

+        return m_pDevice->DrawNormalText(iCurCount, pCurCP, pFxFont, pCache,

+                                         -fFontSize, (const CFX_Matrix*)pMatrix,

+                                         argb, FXTEXT_CLEARTYPE);

 #endif

       }

 #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_

@@ -286,7 +286,7 @@ FX_BOOL CFDE_FxgeDevice::DrawPath(IFDE_Pen* pPen,
   if (!CreatePen(pPen, fPenWidth, graphState)) {

     return FALSE;

   }

-  return m_pDevice->DrawPath(&pGePath->m_Path, (const CFX_AffineMatrix*)pMatrix,

+  return m_pDevice->DrawPath(&pGePath->m_Path, (const CFX_Matrix*)pMatrix,

                              &graphState, 0, pPen->GetColor(), 0);

 }

 FX_BOOL CFDE_FxgeDevice::DrawPolygon(IFDE_Pen* pPen,

@@ -410,7 +410,7 @@ FX_BOOL CFDE_FxgeDevice::FillSolidPath(IFDE_Brush* pBrush,
                                        const CFX_Matrix* pMatrix) {

   FXSYS_assert(pPath && pBrush && pBrush->GetType() == FDE_BRUSHTYPE_Solid);

   IFDE_SolidBrush* pSolidBrush = (IFDE_SolidBrush*)pBrush;

-  return m_pDevice->DrawPath(pPath, (const CFX_AffineMatrix*)pMatrix, NULL,

+  return m_pDevice->DrawPath(pPath, (const CFX_Matrix*)pMatrix, NULL,

                              pSolidBrush->GetColor(), 0, FXFILL_WINDING);

 }

 FX_BOOL CFDE_FxgeDevice::FillHatchPath(IFDE_Brush* pBrush,

@@ -430,13 +430,13 @@ FX_BOOL CFDE_FxgeDevice::FillHatchPath(IFDE_Brush* pBrush,
   FX_ARGB dwBackColor = pHatchBrush->GetColor(FALSE);

   CFX_FloatRect rectf = pPath->GetBoundingBox();

   if (pMatrix) {

-    rectf.Transform((const CFX_AffineMatrix*)pMatrix);

+    rectf.Transform((const CFX_Matrix*)pMatrix);

   }

   FX_RECT rect(FXSYS_round(rectf.left), FXSYS_round(rectf.top),

                FXSYS_round(rectf.right), FXSYS_round(rectf.bottom));

   m_pDevice->SaveState();

   m_pDevice->StartRendering();

-  m_pDevice->SetClip_PathFill(pPath, (const CFX_AffineMatrix*)pMatrix,

+  m_pDevice->SetClip_PathFill(pPath, (const CFX_Matrix*)pMatrix,

                               FXFILL_WINDING);

   m_pDevice->FillRect(&rect, dwBackColor);

   for (int32_t j = rect.bottom; j < rect.top; j += mask.GetHeight())

@@ -476,7 +476,7 @@ FX_BOOL CFDE_FxgeDevice::WrapTexture(int32_t iWrapMode,
                                      const CFX_Matrix* pMatrix) {

   CFX_FloatRect rectf = pPath->GetBoundingBox();

   if (pMatrix) {

-    rectf.Transform((const CFX_AffineMatrix*)pMatrix);

+    rectf.Transform((const CFX_Matrix*)pMatrix);

   }

   FX_RECT rect(FXSYS_round(rectf.left), FXSYS_round(rectf.top),

                FXSYS_round(rectf.right), FXSYS_round(rectf.bottom));

@@ -486,7 +486,7 @@ FX_BOOL CFDE_FxgeDevice::WrapTexture(int32_t iWrapMode,
   }

   m_pDevice->SaveState();

   m_pDevice->StartRendering();

-  m_pDevice->SetClip_PathFill(pPath, (const CFX_AffineMatrix*)pMatrix,

+  m_pDevice->SetClip_PathFill(pPath, (const CFX_Matrix*)pMatrix,

                               FXFILL_WINDING);

   switch (iWrapMode) {

     case FDE_WRAPMODE_Tile:

diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp
index a88fe11ec3..7fc0d1e41c 100644
--- a/xfa/src/fwl/src/theme/checkboxtp.cpp
+++ b/xfa/src/fwl/src/theme/checkboxtp.cpp
@@ -533,7 +533,7 @@ void CFWL_CheckBoxTP::initCheckPath(FX_FLOAT fCheckLen) {
                            pt1.x + px2 * FWLTHEME_BEZIER,

                            pt1.y + py2 * FWLTHEME_BEZIER, pt1.x, pt1.y);

     FX_FLOAT fScale = fCheckLen / CHECKBOX_SIZE_SIGNPATH;

-    CFX_AffineMatrix mt;

+    CFX_Matrix mt;

     mt.Set(1, 0, 0, 1, 0, 0);

     mt.Scale(fScale, fScale);

     CFX_PathData* pData = m_pCheckPath->GetPathData();

diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index 04279f80b7..e456d3e546 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -199,10 +199,10 @@ void CBC_OneDimWriter::ShowDeviceChars(CFX_RenderDevice* device,
   if (matrix != NULL) {

     affine_matrix.Concat(*matrix);

   }

-  device->DrawNormalText(

-      str.GetLength(), pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-      (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

-      FXTEXT_CLEARTYPE);

+  device->DrawNormalText(str.GetLength(), pCharPos, m_pFont,

+                         CFX_GEModule::Get()->GetFontCache(),

+                         (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix,

+                         m_fontColor, FXTEXT_CLEARTYPE);

 }

 void CBC_OneDimWriter::ShowBitmapChars(CFX_DIBitmap* pOutBitmap,

                                        const CFX_ByteString str,

@@ -217,11 +217,10 @@ void CBC_OneDimWriter::ShowBitmapChars(CFX_DIBitmap* pOutBitmap,
   ge.Create((int)geWidth, iTextHeight, m_colorSpace);

   FX_RECT geRect(0, 0, (int)geWidth, iTextHeight);

   ge.FillRect(&geRect, m_backgroundColor);

-  CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

-  ge.DrawNormalText(

-      str.GetLength(), pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-      (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

-      FXTEXT_CLEARTYPE);

+  CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

+  ge.DrawNormalText(str.GetLength(), pCharPos, m_pFont,

+                    CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

+                    (CFX_Matrix*)&affine_matrix, m_fontColor, FXTEXT_CLEARTYPE);

   CFX_FxgeDevice geBitmap;

   geBitmap.Attach(pOutBitmap);

   geBitmap.SetDIBits(ge.GetBitmap(), (int)locX, (int)locY);

diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index d4f90a570f..e66df05445 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -217,7 +217,7 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,
   }

   CalcTextInfo(tempStr, pCharPos + 1, m_pFont, (FX_FLOAT)strWidth, iFontSize,

                blank);

-  CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

+  CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

   CFX_FxgeDevice ge;

   if (pOutBitmap != NULL) {

     ge.Create(strWidth, iTextHeight, FXDIB_Argb);

@@ -225,20 +225,20 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,
     ge.FillRect(&rect, m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos + 1, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

-        1.0, 0.0, 0.0, -1.0, (FX_FLOAT)leftPosition * m_outputHScale,

-        (FX_FLOAT)(m_Height - iTextHeight) + iFontSize);

+    CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0,

+                              (FX_FLOAT)leftPosition * m_outputHScale,

+                              (FX_FLOAT)(m_Height - iTextHeight) + iFontSize);

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos + 1, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos + 1, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   tempStr = str.Mid(7, 6);

   iLen = tempStr.GetLength();

@@ -250,22 +250,22 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,
     ge.FillRect(&rect1, m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos + 7, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 47 * multiple,

                        m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

+    CFX_Matrix affine_matrix1(

         1.0, 0.0, 0.0, -1.0,

         (FX_FLOAT)(leftPosition + 47 * multiple) * m_outputHScale,

         (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos + 7, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos + 7, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   tempStr = str.Mid(0, 1);

   iLen = tempStr.GetLength();

@@ -281,20 +281,19 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,
     ge.GetBitmap()->Clear(m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), 0, m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

-        1.0, 0.0, 0.0, -1.0, 0.0,

-        (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

+    CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0, 0.0,

+                              (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   FX_Free(pCharPos);

 }

diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 74ef0fb1f4..78503fae61 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -213,7 +213,7 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents,
   }

   CalcTextInfo(tempStr, pCharPos, m_pFont, (FX_FLOAT)strWidth, iFontSize,

                blank);

-  CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

+  CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

   CFX_FxgeDevice ge;

   if (pOutBitmap != NULL) {

     delete ge.GetBitmap();

@@ -221,18 +221,18 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents,
     ge.GetBitmap()->Clear(m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

-        1.0, 0.0, 0.0, -1.0, (FX_FLOAT)leftPosition * m_outputHScale,

-        (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

+    CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0,

+                              (FX_FLOAT)leftPosition * m_outputHScale,

+                              (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     affine_matrix1.Concat(*matrix);

-    device->DrawNormalText(

-        iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   tempStr = str.Mid(4, 4);

   iLen = tempStr.GetLength();

@@ -245,22 +245,22 @@ void CBC_OnedEAN8Writer::ShowChars(const CFX_WideStringC& contents,
     ge.GetBitmap()->Clear(m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos + 4, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 33 * multiple,

                        m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

+    CFX_Matrix affine_matrix1(

         1.0, 0.0, 0.0, -1.0,

         (FX_FLOAT)(leftPosition + 33 * multiple) * m_outputHScale,

         (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos + 4, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos + 4, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   FX_Free(pCharPos);

 }

diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index da15a06d1a..d1b98993e7 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -182,27 +182,27 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents,
     strWidth = strWidth * m_outputHScale;

   }

   CalcTextInfo(tempStr, pCharPos + 1, m_pFont, strWidth, iFontSize, blank);

-  CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

+  CFX_Matrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

   CFX_FxgeDevice ge;

   if (pOutBitmap != NULL) {

     ge.Create((int)strWidth, iTextHeight, FXDIB_Argb);

     ge.GetBitmap()->Clear(m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos + 1, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

-        1.0, 0.0, 0.0, -1.0, (FX_FLOAT)leftPosition * m_outputHScale,

-        (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

+    CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0,

+                              (FX_FLOAT)leftPosition * m_outputHScale,

+                              (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos + 1, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos + 1, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   tempStr = str.Mid(6, 5);

   iLen = tempStr.GetLength();

@@ -213,22 +213,22 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents,
     ge.FillRect(&rect2, m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos + 6, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 40 * multiple,

                        m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

+    CFX_Matrix affine_matrix1(

         1.0, 0.0, 0.0, -1.0,

         (FX_FLOAT)(leftPosition + 40 * multiple) * m_outputHScale,

         (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos + 6, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos + 6, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   tempStr = str.Mid(0, 1);

   iLen = tempStr.GetLength();

@@ -243,19 +243,19 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents,
     ge.GetBitmap()->Clear(m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), 0, m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

-        1.0, 0.0, 0.0, -1.0, 0, (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

+    CFX_Matrix affine_matrix1(1.0, 0.0, 0.0, -1.0, 0,

+                              (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   tempStr = str.Mid(11, 1);

   iLen = tempStr.GetLength();

@@ -266,22 +266,22 @@ void CBC_OnedUPCAWriter::ShowChars(const CFX_WideStringC& contents,
     ge.GetBitmap()->Clear(m_backgroundColor);

     ge.DrawNormalText(iLen, pCharPos + 11, m_pFont,

                       CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

-                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      (CFX_Matrix*)&affine_matrix, m_fontColor,

                       FXTEXT_CLEARTYPE);

     geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 85 * multiple,

                        m_Height - iTextHeight);

   } else {

-    CFX_AffineMatrix affine_matrix1(

+    CFX_Matrix affine_matrix1(

         1.0, 0.0, 0.0, -1.0,

         (FX_FLOAT)(leftPosition + 85 * multiple) * m_outputHScale,

         (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

     if (matrix != NULL) {

       affine_matrix1.Concat(*matrix);

     }

-    device->DrawNormalText(

-        iLen, pCharPos + 11, m_pFont, CFX_GEModule::Get()->GetFontCache(),

-        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

-        FXTEXT_CLEARTYPE);

+    device->DrawNormalText(iLen, pCharPos + 11, m_pFont,

+                           CFX_GEModule::Get()->GetFontCache(),

+                           (FX_FLOAT)iFontSize, (CFX_Matrix*)&affine_matrix1,

+                           m_fontColor, FXTEXT_CLEARTYPE);

   }

   FX_Free(pCharPos);

 }

diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
index a24a4886f8..801c66a8bc 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
@@ -477,7 +477,7 @@ class CXFA_ImageRenderer {
                 CFX_DIBSource* pDIBSource,

                 FX_ARGB bitmap_argb,

                 int bitmap_alpha,

-                const CFX_AffineMatrix* pImage2Device,

+                const CFX_Matrix* pImage2Device,

                 FX_DWORD flags,

                 int blendType = FXDIB_BLEND_NORMAL);

   FX_BOOL Continue(IFX_Pause* pPause);

@@ -485,7 +485,7 @@ class CXFA_ImageRenderer {
  protected:

   CFX_RenderDevice* m_pDevice;

   int m_Status;

-  CFX_AffineMatrix m_ImageMatrix;

+  CFX_Matrix m_ImageMatrix;

   CFX_DIBSource* m_pDIBSource;

   CFX_DIBitmap* m_pCloneConvert;

   int m_BitmapAlpha;

@@ -534,7 +534,7 @@ FX_BOOL CXFA_ImageRenderer::Start(CFX_RenderDevice* pDevice,
                                   CFX_DIBSource* pDIBSource,

                                   FX_ARGB bitmap_argb,

                                   int bitmap_alpha,

-                                  const CFX_AffineMatrix* pImage2Device,

+                                  const CFX_Matrix* pImage2Device,

                                   FX_DWORD flags,

                                   int blendType) {

   m_pDevice = pDevice;

diff --git a/xfa/src/fxgraphics/src/fx_graphics.cpp b/xfa/src/fxgraphics/src/fx_graphics.cpp
index 69b0c2ad9b..53d001e9d7 100644
--- a/xfa/src/fxgraphics/src/fx_graphics.cpp
+++ b/xfa/src/fxgraphics/src/fx_graphics.cpp
@@ -372,7 +372,7 @@ FX_ERR CFX_Graphics::ClipPath(CFX_Path* path,
     case FX_CONTEXT_Device: {

       _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);

       FX_BOOL result = _renderDevice->SetClip_PathFill(

-          path->GetPathData(), (CFX_AffineMatrix*)matrix, fillMode);

+          path->GetPathData(), (CFX_Matrix*)matrix, fillMode);

       _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);

       return FX_ERR_Succeeded;

     }

@@ -739,7 +739,7 @@ FX_ERR CFX_Graphics::RenderDeviceStrokePath(CFX_Path* path,
   switch (_info._strokeColor->_type) {

     case FX_COLOR_Solid: {

       FX_BOOL result = _renderDevice->DrawPath(

-          path->GetPathData(), (CFX_AffineMatrix*)&m, &_info._graphState, 0x0,

+          path->GetPathData(), (CFX_Matrix*)&m, &_info._graphState, 0x0,

           _info._strokeColor->_argb, 0);

       _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);

       return FX_ERR_Succeeded;

@@ -766,7 +766,7 @@ FX_ERR CFX_Graphics::RenderDeviceFillPath(CFX_Path* path,
   switch (_info._fillColor->_type) {

     case FX_COLOR_Solid: {

       FX_BOOL result = _renderDevice->DrawPath(

-          path->GetPathData(), (CFX_AffineMatrix*)&m, &_info._graphState,

+          path->GetPathData(), (CFX_Matrix*)&m, &_info._graphState,

           _info._fillColor->_argb, 0x0, fillMode);

       _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);

       return FX_ERR_Succeeded;

@@ -795,7 +795,7 @@ FX_ERR CFX_Graphics::RenderDeviceDrawImage(CFX_DIBSource* source,
   m2.Concat(m1);

   int32_t left, top;

   CFX_DIBitmap* bmp1 = source->FlipImage(FALSE, TRUE);

-  CFX_DIBitmap* bmp2 = bmp1->TransformTo((CFX_AffineMatrix*)&m2, left, top);

+  CFX_DIBitmap* bmp2 = bmp1->TransformTo((CFX_Matrix*)&m2, left, top);

   CFX_RectF r;

   GetClipRect(r);

   FX_ERR result = FX_ERR_Indefinite;

@@ -836,7 +836,7 @@ FX_ERR CFX_Graphics::RenderDeviceStretchImage(CFX_DIBSource* source,
   m2.Concat(m1);

   int32_t left, top;

   CFX_DIBitmap* bmp2 = bmp1->FlipImage(FALSE, TRUE);

-  CFX_DIBitmap* bmp3 = bmp2->TransformTo((CFX_AffineMatrix*)&m2, left, top);

+  CFX_DIBitmap* bmp3 = bmp2->TransformTo((CFX_Matrix*)&m2, left, top);

   CFX_RectF r;

   GetClipRect(r);

   FX_ERR result = FX_ERR_Indefinite;

@@ -881,7 +881,7 @@ FX_ERR CFX_Graphics::RenderDeviceShowText(const CFX_PointF& point,
   }

   FX_BOOL result = _renderDevice->DrawNormalText(

       length, charPos, _info._font, CFX_GEModule::Get()->GetFontCache(),

-      -_info._fontSize * _info._fontHScale, (CFX_AffineMatrix*)&m,

+      -_info._fontSize * _info._fontHScale, (CFX_Matrix*)&m,

       _info._fillColor->_argb, FXTEXT_CLEARTYPE);

   _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);

   FX_Free(charPos);

@@ -931,7 +931,7 @@ FX_ERR CFX_Graphics::FillPathWithPattern(CFX_Path* path,
                    mask.GetPitch() * data.height);

       CFX_FloatRect rectf = path->GetPathData()->GetBoundingBox();

       if (matrix) {

-        rectf.Transform((const CFX_AffineMatrix*)matrix);

+        rectf.Transform((const CFX_Matrix*)matrix);

       }

       FX_RECT rect(FXSYS_round(rectf.left), FXSYS_round(rectf.top),

                    FXSYS_round(rectf.right), FXSYS_round(rectf.bottom));

@@ -947,8 +947,8 @@ FX_ERR CFX_Graphics::FillPathWithPattern(CFX_Path* path,
     }

   }

   _renderDevice->SaveState();

-  _renderDevice->SetClip_PathFill(path->GetPathData(),

-                                  (CFX_AffineMatrix*)matrix, fillMode);

+  _renderDevice->SetClip_PathFill(path->GetPathData(), (CFX_Matrix*)matrix,

+                                  fillMode);

   SetDIBitsWithMatrix(&bmp, &pattern->_matrix);

   _renderDevice->RestoreState();

   return FX_ERR_Succeeded;

@@ -1066,8 +1066,8 @@ FX_ERR CFX_Graphics::FillPathWithShading(CFX_Path* path,
   }

   if (result) {

     _renderDevice->SaveState();

-    _renderDevice->SetClip_PathFill(path->GetPathData(),

-                                    (CFX_AffineMatrix*)matrix, fillMode);

+    _renderDevice->SetClip_PathFill(path->GetPathData(), (CFX_Matrix*)matrix,

+                                    fillMode);

     SetDIBitsWithMatrix(&bmp, matrix);

     _renderDevice->RestoreState();

   }

@@ -1084,7 +1084,7 @@ FX_ERR CFX_Graphics::SetDIBitsWithMatrix(CFX_DIBSource* source,
     m.Concat(*matrix);

     int32_t left, top;

     CFX_DIBitmap* bmp1 = source->FlipImage(FALSE, TRUE);

-    CFX_DIBitmap* bmp2 = bmp1->TransformTo((CFX_AffineMatrix*)&m, left, top);

+    CFX_DIBitmap* bmp2 = bmp1->TransformTo((CFX_Matrix*)&m, left, top);

     _renderDevice->SetDIBits(bmp2, left, top);

     if (bmp2) {

       delete bmp2;