Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/ge/fx_ge_device.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 "core/include/fxge/fx_ge.h"
 
 CFX_RenderDevice::CFX_RenderDevice() {
   m_pDeviceDriver = NULL;
@@ skipping 53 matching lines @@
   }
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
   return pDIB->Create(width, height, m_RenderCaps & FXRC_ALPHA_OUTPUT
                                          ? FXDIB_Argb
                                          : FXDIB_Rgb32);
 #else
   return pDIB->Create(
       width, height, m_RenderCaps & FXRC_ALPHA_OUTPUT ? FXDIB_Argb : FXDIB_Rgb);
 #endif
 }
-FX_BOOL CFX_RenderDevice::SetClip_PathFill(
-    const CFX_PathData* pPathData,
-    const CFX_AffineMatrix* pObject2Device,
-    int fill_mode) {
+FX_BOOL CFX_RenderDevice::SetClip_PathFill(const CFX_PathData* pPathData,
+                                           const CFX_Matrix* pObject2Device,
+                                           int fill_mode) {
   if (!m_pDeviceDriver->SetClip_PathFill(pPathData, pObject2Device,
                                          fill_mode)) {
     return FALSE;
   }
   UpdateClipBox();
   return TRUE;
 }
 FX_BOOL CFX_RenderDevice::SetClip_PathStroke(
     const CFX_PathData* pPathData,
-    const CFX_AffineMatrix* pObject2Device,
+    const CFX_Matrix* pObject2Device,
     const CFX_GraphStateData* pGraphState) {
   if (!m_pDeviceDriver->SetClip_PathStroke(pPathData, pObject2Device,
                                            pGraphState)) {
     return FALSE;
   }
   UpdateClipBox();
   return TRUE;
 }
 FX_BOOL CFX_RenderDevice::SetClip_Rect(const FX_RECT* pRect) {
   CFX_PathData path;
   path.AppendRect((FX_FLOAT)(pRect->left), (FX_FLOAT)(pRect->bottom),
                   (FX_FLOAT)(pRect->right), (FX_FLOAT)(pRect->top));
   if (!SetClip_PathFill(&path, NULL, FXFILL_WINDING)) {
     return FALSE;
   }
   UpdateClipBox();
   return TRUE;
 }
 void CFX_RenderDevice::UpdateClipBox() {
   if (m_pDeviceDriver->GetClipBox(&m_ClipBox)) {
     return;
   }
   m_ClipBox.left = 0;
   m_ClipBox.top = 0;
   m_ClipBox.right = m_Width;
   m_ClipBox.bottom = m_Height;
 }
 FX_BOOL CFX_RenderDevice::DrawPath(const CFX_PathData* pPathData,
-                                   const CFX_AffineMatrix* pObject2Device,
+                                   const CFX_Matrix* pObject2Device,
                                    const CFX_GraphStateData* pGraphState,
                                    FX_DWORD fill_color,
                                    FX_DWORD stroke_color,
                                    int fill_mode,
                                    int alpha_flag,
                                    void* pIccTransform,
                                    int blend_type) {
   uint8_t fill_alpha, stroke_alpha;
   if (FXGETFLAG_COLORTYPE(alpha_flag)) {
     fill_alpha = FXGETFLAG_ALPHA_FILL(alpha_flag);
@@ skipping 78 matching lines @@
       graphState.m_LineWidth = 0.0f;
       FX_DWORD strokecolor = fill_color;
       if (bThin) {
         if (FXGETFLAG_COLORTYPE(alpha_flag)) {
           FXSETFLAG_ALPHA_STROKE(alpha_flag, fill_alpha >> 2);
         } else {
           strokecolor =
               (((fill_alpha >> 2) << 24) | (strokecolor & 0x00ffffff));
         }
       }
-      CFX_AffineMatrix* pMatrix = NULL;
+      CFX_Matrix* pMatrix = NULL;
       if (pObject2Device && !pObject2Device->IsIdentity()) {
-        pMatrix = (CFX_AffineMatrix*)pObject2Device;
+        pMatrix = (CFX_Matrix*)pObject2Device;
       }
       int smooth_path = FX_ZEROAREA_FILL;
       if (fill_mode & FXFILL_NOPATHSMOOTH) {
         smooth_path |= FXFILL_NOPATHSMOOTH;
       }
       m_pDeviceDriver->DrawPath(&newPath, pMatrix, &graphState, 0, strokecolor,
                                 smooth_path, alpha_flag, pIccTransform,
                                 blend_type);
     }
   }
@@ skipping 25 matching lines @@
       bitmap.Clear(0);
       Backdrop.Copy(&bitmap);
     } else {
       if (!m_pDeviceDriver->GetDIBits(&bitmap, rect.left, rect.top, NULL)) {
         return FALSE;
       }
       Backdrop.Copy(&bitmap);
     }
     CFX_FxgeDevice bitmap_device;
     bitmap_device.Attach(&bitmap, 0, FALSE, &Backdrop, TRUE);
-    CFX_AffineMatrix matrix;
+    CFX_Matrix matrix;
     if (pObject2Device) {
       matrix = *pObject2Device;
     }
     matrix.TranslateI(-rect.left, -rect.top);
     matrix.Concat(fScaleX, 0, 0, fScaleY, 0, 0);
     if (!bitmap_device.GetDeviceDriver()->DrawPath(
             pPathData, &matrix, pGraphState, fill_color, stroke_color,
             fill_mode, alpha_flag, pIccTransform, blend_type)) {
       return FALSE;
     }
@@ skipping 82 matching lines @@
 }
 CFX_DIBitmap* CFX_RenderDevice::GetBackDrop() {
   return m_pDeviceDriver->GetBackDrop();
 }
 FX_BOOL CFX_RenderDevice::SetDIBits(const CFX_DIBSource* pBitmap,
                                     int left,
                                     int top,
                                     int blend_mode,
                                     void* pIccTransform) {
   ASSERT(!pBitmap->IsAlphaMask());
-  CFX_AffineMatrix ctm = GetCTM();
+  CFX_Matrix ctm = GetCTM();
   FX_FLOAT fScaleX = FXSYS_fabs(ctm.a);
   FX_FLOAT fScaleY = FXSYS_fabs(ctm.d);
   FX_RECT dest_rect(left, top,
                     FXSYS_round(left + pBitmap->GetWidth() / fScaleX),
                     FXSYS_round(top + pBitmap->GetHeight() / fScaleY));
   dest_rect.Intersect(m_ClipBox);
   if (dest_rect.IsEmpty()) {
     return TRUE;
   }
   FX_RECT src_rect(dest_rect.left - left, dest_rect.top - top,
@@ skipping 74 matching lines @@
   FX_RECT dest_rect(left, top, left + dest_width, top + dest_height);
   FX_RECT clip_box = m_ClipBox;
   clip_box.Intersect(dest_rect);
   return m_pDeviceDriver->StretchDIBits(pBitmap, argb, left, top, dest_width,
                                         dest_height, &clip_box, flags,
                                         alpha_flag, pIccTransform);
 }
 FX_BOOL CFX_RenderDevice::StartDIBits(const CFX_DIBSource* pBitmap,
                                       int bitmap_alpha,
                                       FX_DWORD argb,
-                                      const CFX_AffineMatrix* pMatrix,
+                                      const CFX_Matrix* pMatrix,
                                       FX_DWORD flags,
                                       void*& handle,
                                       int alpha_flag,
                                       void* pIccTransform,
                                       int blend_mode) {
   return m_pDeviceDriver->StartDIBits(pBitmap, bitmap_alpha, argb, pMatrix,
                                       flags, handle, alpha_flag, pIccTransform,
                                       blend_mode);
 }
 FX_BOOL CFX_RenderDevice::ContinueDIBits(void* handle, IFX_Pause* pPause) {
   return m_pDeviceDriver->ContinueDIBits(handle, pPause);
 }
 void CFX_RenderDevice::CancelDIBits(void* handle) {
   m_pDeviceDriver->CancelDIBits(handle);
 }