Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/apple/fx_apple_platform.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_system.h"
 #include "core/include/fxge/fx_ge.h"
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
@@ skipping 16 matching lines @@
   if (m_pPlatformGraphics) {
     quartz2d.destroyGraphics(m_pPlatformGraphics);
     m_pPlatformGraphics = NULL;
   }
 }
 void CFX_FaceCache::InitPlatform() {}
 void CFX_FaceCache::DestroyPlatform() {}
 CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext(
     CFX_Font* pFont,
     FX_DWORD glyph_index,
-    const CFX_AffineMatrix* pMatrix,
+    const CFX_Matrix* pMatrix,
     int dest_width,
     int anti_alias) {
   return NULL;
 }
 static FX_BOOL _CGDrawGlyphRun(CGContextRef pContext,
                                int nChars,
                                const FXTEXT_CHARPOS* pCharPos,
                                CFX_Font* pFont,
                                CFX_FontCache* pCache,
-                               const CFX_AffineMatrix* pObject2Device,
+                               const CFX_Matrix* pObject2Device,
                                FX_FLOAT font_size,
                                FX_DWORD argb,
                                int alpha_flag,
                                void* pIccTransform) {
   if (nChars == 0) {
     return TRUE;
   }
-  CFX_AffineMatrix new_matrix;
+  CFX_Matrix new_matrix;
   FX_BOOL bNegSize = font_size < 0;
   if (bNegSize) {
     font_size = -font_size;
   }
   FX_FLOAT ori_x = pCharPos[0].m_OriginX, ori_y = pCharPos[0].m_OriginY;
   new_matrix.Transform(ori_x, ori_y);
   if (pObject2Device) {
     new_matrix.Concat(*pObject2Device);
   }
   CQuartz2D& quartz2d =
@@ skipping 24 matching lines @@
   } else {
     new_matrix.b = -new_matrix.b;
     new_matrix.d = -new_matrix.d;
   }
   quartz2d.setGraphicsTextMatrix(pContext, &new_matrix);
   return quartz2d.drawGraphicsString(pContext, pFont->GetPlatformFont(),
                                      font_size, glyph_indices, glyph_positions,
                                      nChars, argb, NULL);
 }
 static void _DoNothing(void* info, const void* data, size_t size) {}
-FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(
-    int nChars,
-    const FXTEXT_CHARPOS* pCharPos,
-    CFX_Font* pFont,
-    CFX_FontCache* pCache,
-    const CFX_AffineMatrix* pObject2Device,
-    FX_FLOAT font_size,
-    FX_DWORD argb,
-    int alpha_flag,
-    void* pIccTransform) {
+FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars,
+                                            const FXTEXT_CHARPOS* pCharPos,
+                                            CFX_Font* pFont,
+                                            CFX_FontCache* pCache,
+                                            const CFX_Matrix* pObject2Device,
+                                            FX_FLOAT font_size,
+                                            FX_DWORD argb,
+                                            int alpha_flag,
+                                            void* pIccTransform) {
   if (!pFont) {
     return FALSE;
   }
   FX_BOOL bBold = pFont->IsBold();
   if (!bBold && pFont->GetSubstFont() &&
       pFont->GetSubstFont()->m_Weight >= 500 &&
       pFont->GetSubstFont()->m_Weight <= 600) {
     return FALSE;
   }
   for (int i = 0; i < nChars; i++) {
@@ skipping 45 matching lines @@
 void CFX_Font::ReleasePlatformResource() {
   if (m_pPlatformFont) {
     CQuartz2D& quartz2d =
         ((CApplePlatform*)CFX_GEModule::Get()->GetPlatformData())->_quartz2d;
     quartz2d.DestroyFont(m_pPlatformFont);
     m_pPlatformFont = NULL;
   }
 }
 
 #endif  // _FXM_PLATFORM_  == _FXM_PLATFORM_APPLE_