Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/apple/apple_int.h

 // 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
 
 #ifndef CORE_SRC_FXGE_APPLE_APPLE_INT_H_
 #define CORE_SRC_FXGE_APPLE_APPLE_INT_H_
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
@@ skipping 35 matching lines @@
   FX_DWORD charsets;
   FX_DWORD styles;
 } IOS_FONTDATA;
 class CQuartz2D {
  public:
   void* createGraphics(CFX_DIBitmap* bitmap);
   void destroyGraphics(void* graphics);
 
   void* CreateFont(const uint8_t* pFontData, FX_DWORD dwFontSize);
   void DestroyFont(void* pFont);
-  void setGraphicsTextMatrix(void* graphics, CFX_AffineMatrix* matrix);
+  void setGraphicsTextMatrix(void* graphics, CFX_Matrix* matrix);
   FX_BOOL drawGraphicsString(void* graphics,
                              void* font,
                              FX_FLOAT fontSize,
                              FX_WORD* glyphIndices,
                              CGPoint* glyphPositions,
                              int32_t chars,
                              FX_ARGB argb,
-                             CFX_AffineMatrix* matrix = NULL);
+                             CFX_Matrix* matrix = NULL);
   void saveGraphicsState(void* graphics);
   void restoreGraphicsState(void* graphics);
 };
 class CApplePlatform {
  public:
   CApplePlatform() {}
   ~CApplePlatform() {}
 
   CQuartz2D _quartz2d;
 };
 
 class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver {
  public:
   CFX_QuartzDeviceDriver(CGContextRef context, int32_t deviceClass);
   ~CFX_QuartzDeviceDriver() override;
 
   // IFX_RenderDeviceDriver
   int GetDeviceCaps(int caps_id) override;
   CFX_Matrix GetCTM() const override;
   FX_BOOL IsPSPrintDriver() override { return FALSE; }
   FX_BOOL StartRendering() override { return TRUE; }
   void EndRendering() override {}
   void SaveState() override;
   void RestoreState(FX_BOOL bKeepSaved) override;
   FX_BOOL SetClip_PathFill(const CFX_PathData* pPathData,
-                           const CFX_AffineMatrix* pObject2Device,
+                           const CFX_Matrix* pObject2Device,
                            int fill_mode) override;
   FX_BOOL SetClip_PathStroke(const CFX_PathData* pPathData,
-                             const CFX_AffineMatrix* pObject2Device,
+                             const CFX_Matrix* pObject2Device,
                              const CFX_GraphStateData* pGraphState) override;
   FX_BOOL 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 = 0,
                    void* pIccTransform = NULL,
                    int blend_type = FXDIB_BLEND_NORMAL) override;
   FX_BOOL SetPixel(int x,
                    int y,
                    FX_DWORD color,
@@ skipping 36 matching lines @@
                         int dest_width,
                         int dest_height,
                         const FX_RECT* pClipRect,
                         FX_DWORD flags,
                         int alpha_flag = 0,
                         void* pIccTransform = NULL,
                         int blend_type = FXDIB_BLEND_NORMAL) override;
   FX_BOOL StartDIBits(const CFX_DIBSource* pBitmap,
                       int bitmap_alpha,
                       FX_DWORD color,
-                      const CFX_AffineMatrix* pMatrix,
+                      const CFX_Matrix* pMatrix,
                       FX_DWORD flags,
                       void*& handle,
                       int alpha_flag = 0,
                       void* pIccTransform = NULL,
                       int blend_type = FXDIB_BLEND_NORMAL) override {
     return FALSE;
   }
   FX_BOOL ContinueDIBits(void* handle, IFX_Pause* pPause) override {
     return FALSE;
   }
   void CancelDIBits(void* handle) override {}
   FX_BOOL DrawDeviceText(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 color,
                          int alpha_flag = 0,
                          void* pIccTransform = NULL) override;
   void* GetPlatformSurface() override { return NULL; }
   void ClearDriver() override;
 
  protected:
   void setStrokeInfo(const CFX_GraphStateData* graphState,
                      FX_ARGB argb,
                      FX_FLOAT lineWidth);
   void setFillInfo(FX_ARGB argb);
   void setPathToContext(const CFX_PathData* pathData);
   FX_FLOAT getLineWidth(const CFX_GraphStateData* graphState,
                         CGAffineTransform ctm);
   FX_BOOL CG_DrawGlypRun(int nChars,
                          const FXTEXT_CHARPOS* pCharPos,
                          CFX_Font* pFont,
                          CFX_FontCache* pCache,
-                         const CFX_AffineMatrix* pGlyphMatrix,
-                         const CFX_AffineMatrix* pObject2Device,
+                         const CFX_Matrix* pGlyphMatrix,
+                         const CFX_Matrix* pObject2Device,
                          FX_FLOAT font_size,
                          FX_DWORD argb,
                          int alpha_flag,
                          void* pIccTransform);
   void CG_SetImageTransform(int dest_left,
                             int dest_top,
                             int dest_width,
                             int dest_height,
                             CGRect* rect = NULL);
 
@@ skipping 59 matching lines @@
   int _totalSize;
 };
 
 uint32_t FX_GetHashCode(const FX_CHAR* pStr);
 FX_DWORD FX_IOSGetMatchFamilyNameHashcode(const FX_CHAR* pFontName);
 uint32_t FX_IOSGetFamilyNamesCount();
 const FX_CHAR* FX_IOSGetFamilyName(uint32_t uIndex);
 #endif
 
 #endif  // CORE_SRC_FXGE_APPLE_APPLE_INT_H_