Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/apple/fx_quartz_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/fxcrt/fx_ext.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "core/src/fxge/agg/include/fx_agg_driver.h"
@@ skipping 38 matching lines @@
   if (NULL == pDataProvider) {
     return NULL;
   }
   CGFontRef pCGFont = CGFontCreateWithDataProvider(pDataProvider);
   CGDataProviderRelease(pDataProvider);
   return pCGFont;
 }
 void CQuartz2D::DestroyFont(void* pFont) {
   CGFontRelease((CGFontRef)pFont);
 }
-void CQuartz2D::setGraphicsTextMatrix(void* graphics,
-                                      CFX_AffineMatrix* matrix) {
+void CQuartz2D::setGraphicsTextMatrix(void* graphics, CFX_Matrix* matrix) {
   if (!graphics || !matrix) {
     return;
   }
   CGContextRef context = (CGContextRef)graphics;
   CGFloat ty = CGBitmapContextGetHeight(context) - matrix->f;
   CGContextSetTextMatrix(
       context, CGAffineTransformMake(matrix->a, matrix->b, matrix->c, matrix->d,
                                      matrix->e, ty));
 }
 FX_BOOL CQuartz2D::drawGraphicsString(void* graphics,
                                       void* font,
                                       FX_FLOAT fontSize,
                                       FX_WORD* glyphIndices,
                                       CGPoint* glyphPositions,
                                       int32_t charsCount,
                                       FX_ARGB argb,
-                                      CFX_AffineMatrix* matrix) {
+                                      CFX_Matrix* matrix) {
   if (!graphics) {
     return FALSE;
   }
   CGContextRef context = (CGContextRef)graphics;
   CGContextSetFont(context, (CGFontRef)font);
   CGContextSetFontSize(context, fontSize);
   if (matrix) {
     CGAffineTransform m = CGContextGetTextMatrix(context);
     m = CGAffineTransformConcat(
         m, CGAffineTransformMake(matrix->a, matrix->b, matrix->c, matrix->d,
@@ skipping 129 matching lines @@
 }
 void CFX_QuartzDeviceDriver::RestoreState(FX_BOOL isKeepSaved) {
   CGContextRestoreGState(_context);
   if (isKeepSaved) {
     CGContextSaveGState(_context);
   } else {
     m_saveCount--;
   }
 }
 FX_BOOL CFX_QuartzDeviceDriver::SetClip_PathFill(const CFX_PathData* pathData,
-                                                 const CFX_AffineMatrix* matrix,
+                                                 const CFX_Matrix* matrix,
                                                  int fillMode) {
   SaveState();
   CGAffineTransform m = CGAffineTransformIdentity;
   if (matrix) {
     m = CGAffineTransformMake(matrix->GetA(), matrix->GetB(), matrix->GetC(),
                               matrix->GetD(), matrix->GetE(), matrix->GetF());
   }
   m = CGAffineTransformConcat(m, _foxitDevice2User);
   CGContextConcatCTM(_context, m);
   setPathToContext(pathData);
@@ skipping 15 matching lines @@
     size.height = 1;
     CGSize temp = CGSizeApplyAffineTransform(size, ctm);
     CGFloat x = 1 / temp.width;
     CGFloat y = 1 / temp.height;
     lineWidth = x > y ? x : y;
   }
   return lineWidth;
 }
 FX_BOOL CFX_QuartzDeviceDriver::SetClip_PathStroke(
     const CFX_PathData* pathData,
-    const CFX_AffineMatrix* matrix,
+    const CFX_Matrix* matrix,
     const CFX_GraphStateData* graphState) {
   SaveState();
   CGAffineTransform m = CGAffineTransformIdentity;
   if (matrix) {
     m = CGAffineTransformMake(matrix->GetA(), matrix->GetB(), matrix->GetC(),
                               matrix->GetD(), matrix->GetE(), matrix->GetF());
   }
   m = CGAffineTransformConcat(m, _foxitDevice2User);
   CGContextConcatCTM(_context, m);
   FX_FLOAT lineWidth = getLineWidth(graphState, m);
@@ skipping 55 matching lines @@
     case FXDIB_BLEND_LUMINOSITY:
       mode = kCGBlendModeLuminosity;
       break;
     default:
       mode = kCGBlendModeNormal;
       break;
   }
   return mode;
 }
 FX_BOOL CFX_QuartzDeviceDriver::DrawPath(const CFX_PathData* pathData,
-                                         const CFX_AffineMatrix* matrix,
+                                         const CFX_Matrix* matrix,
                                          const CFX_GraphStateData* graphState,
                                          FX_DWORD fillArgb,
                                          FX_DWORD strokeArgb,
                                          int fillMode,
                                          int alpha_flag,
                                          void* pIccTransform,
                                          int blend_type) {
   SaveState();
   CGBlendMode mode = GetCGBlendMode(blend_type);
   if (mode != kCGBlendModeNormal) {
@@ skipping 379 matching lines @@
   CGImageRef image = CGBitmapContextCreateImage(ctx);
   CGContextDrawImage(_context, rect, image);
   CGImageRelease(image);
   CGContextRelease(ctx);
   if (pBitmap1 != pBitmap) {
     delete pBitmap1;
   }
   RestoreState(FALSE);
   return TRUE;
 }
-FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlypRun(
-    int nChars,
-    const FXTEXT_CHARPOS* pCharPos,
-    CFX_Font* pFont,
-    CFX_FontCache* pCache,
-    const CFX_AffineMatrix* pGlyphMatrix,
-    const CFX_AffineMatrix* pObject2Device,
-    FX_FLOAT font_size,
-    FX_DWORD argb,
-    int alpha_flag,
-    void* pIccTransform) {
+FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlypRun(int nChars,
+                                               const FXTEXT_CHARPOS* pCharPos,
+                                               CFX_Font* pFont,
+                                               CFX_FontCache* pCache,
+                                               const CFX_Matrix* pGlyphMatrix,
+                                               const CFX_Matrix* pObject2Device,
+                                               FX_FLOAT font_size,
+                                               FX_DWORD argb,
+                                               int alpha_flag,
+                                               void* pIccTransform) {
   if (nChars == 0) {
     return TRUE;
   }
   CQuartz2D& quartz2d =
       ((CApplePlatform*)CFX_GEModule::Get()->GetPlatformData())->_quartz2d;
   if (!pFont->GetPlatformFont()) {
     if (pFont->GetPsName() == CFX_WideString::FromLocal("DFHeiStd-W5")) {
       return FALSE;
     }
     pFont->SetPlatformFont(
         quartz2d.CreateFont(pFont->GetFontData(), pFont->GetSize()));
     if (!pFont->GetPlatformFont()) {
       return FALSE;
     }
   }
   CFX_FixedBufGrow<FX_WORD, 32> glyph_indices(nChars);
   CFX_FixedBufGrow<CGPoint, 32> glyph_positions(nChars);
   for (int i = 0; i < nChars; i++) {
     glyph_indices[i] = pCharPos[i].m_ExtGID;
     glyph_positions[i].x = pCharPos[i].m_OriginX;
     glyph_positions[i].y = pCharPos[i].m_OriginY;
   }
-  CFX_AffineMatrix text_matrix;
+  CFX_Matrix text_matrix;
   if (pObject2Device) {
     text_matrix.Concat(*pObject2Device);
   }
   CGAffineTransform matrix_cg =
       CGAffineTransformMake(text_matrix.a, text_matrix.b, text_matrix.c,
                             text_matrix.d, text_matrix.e, text_matrix.f);
   matrix_cg = CGAffineTransformConcat(matrix_cg, _foxitDevice2User);
   CGContextSetTextMatrix(_context, matrix_cg);
   CGContextSetFont(_context, (CGFontRef)pFont->GetPlatformFont());
   CGContextSetFontSize(_context, FXSYS_fabs(font_size));
@@ skipping 13 matching lines @@
       glyph_matrix = CGAffineTransformInvert(glyph_matrix);
     }
     CGContextConcatCTM(_context, glyph_matrix);
     CGContextTranslateCTM(_context, -origin.x, -origin.y);
   }
   CGContextShowGlyphsAtPositions(_context, (CGGlyph*)glyph_indices,
                                  glyph_positions, nChars);
   RestoreState(FALSE);
   return TRUE;
 }
-FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(
-    int nChars,
-    const FXTEXT_CHARPOS* pCharPos,
-    CFX_Font* pFont,
-    CFX_FontCache* pCache,
-    const CFX_AffineMatrix* pObject2Device,
-    FX_FLOAT font_size,
-    FX_DWORD color,
-    int alpha_flag,
-    void* pIccTransform) {
+FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars,
+                                               const FXTEXT_CHARPOS* pCharPos,
+                                               CFX_Font* pFont,
+                                               CFX_FontCache* pCache,
+                                               const CFX_Matrix* pObject2Device,
+                                               FX_FLOAT font_size,
+                                               FX_DWORD color,
+                                               int alpha_flag,
+                                               void* pIccTransform) {
   if (NULL == pFont || NULL == _context) {
     return FALSE;
   }
   FX_BOOL bBold = pFont->IsBold();
   if (!bBold && pFont->GetSubstFont() &&
       pFont->GetSubstFont()->m_Weight >= 500 &&
       pFont->GetSubstFont()->m_Weight <= 600) {
     return FALSE;
   }
   SaveState();
   CGContextSetTextDrawingMode(_context, kCGTextFillClip);
   FX_BOOL ret = FALSE;
   int32_t i = 0;
   while (i < nChars) {
     if (pCharPos[i].m_bGlyphAdjust || font_size < 0) {
       if (i > 0) {
         ret = CG_DrawGlypRun(i, pCharPos, pFont, pCache, NULL, pObject2Device,
                              font_size, color, alpha_flag, pIccTransform);
         if (!ret) {
           RestoreState(FALSE);
           return ret;
         }
       }
       const FXTEXT_CHARPOS* char_pos = pCharPos + i;
-      CFX_AffineMatrix glphy_matrix;
+      CFX_Matrix glphy_matrix;
       if (font_size < 0) {
         glphy_matrix.Concat(-1, 0, 0, -1, 0, 0);
       }
       if (char_pos->m_bGlyphAdjust) {
         glphy_matrix.Concat(
             char_pos->m_AdjustMatrix[0], char_pos->m_AdjustMatrix[1],
             char_pos->m_AdjustMatrix[2], char_pos->m_AdjustMatrix[3], 0, 0);
       }
       ret = CG_DrawGlypRun(1, char_pos, pFont, pCache, &glphy_matrix,
                            pObject2Device, font_size, color, alpha_flag,
@@ skipping 191 matching lines @@
   }
   CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
   if (!pBitmap->Create(width, height, format)) {
     delete pBitmap;
     return FALSE;
   }
   m_bOwnedBitmap = TRUE;
   return Attach(pBitmap);
 }
 #endif  // _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_