Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/include/fpdfapi/fpdf_render.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_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_
 
 #include "core/include/fxge/fx_ge.h"
@@ skipping 76 matching lines @@
   void Create(CPDF_Document* pDoc = NULL,
               CPDF_PageRenderCache* pPageCache = NULL,
               CPDF_Dictionary* pPageResources = NULL,
               FX_BOOL bFirstLayer = TRUE);
 
   ~CPDF_RenderContext();
 
   void Clear();
 
   void AppendObjectList(CPDF_PageObjects* pObjs,
-                        const CFX_AffineMatrix* pObject2Device);
+                        const CFX_Matrix* pObject2Device);
 
   void Render(CFX_RenderDevice* pDevice,
               const CPDF_RenderOptions* pOptions = NULL,
-              const CFX_AffineMatrix* pFinalMatrix = NULL);
+              const CFX_Matrix* pFinalMatrix = NULL);
 
   void DrawObjectList(CFX_RenderDevice* pDevice,
                       CPDF_PageObjects* pObjs,
-                      const CFX_AffineMatrix* pObject2Device,
+                      const CFX_Matrix* pObject2Device,
                       const CPDF_RenderOptions* pOptions);
 
   void GetBackground(CFX_DIBitmap* pBuffer,
                      const CPDF_PageObject* pObj,
                      const CPDF_RenderOptions* pOptions,
-                     CFX_AffineMatrix* pFinalMatrix);
+                     CFX_Matrix* pFinalMatrix);
 
   CPDF_PageRenderCache* GetPageCache() const { return m_pPageCache; }
 
   CPDF_Document* m_pDocument;
 
   CPDF_Dictionary* m_pPageResources;
 
   CPDF_PageRenderCache* m_pPageCache;
 
  protected:
   CFX_ArrayTemplate<struct _PDF_RenderItem> m_ContentList;
 
   FX_BOOL m_bFirstLayer;
 
   void Render(CFX_RenderDevice* pDevice,
               const CPDF_PageObject* pStopObj,
               const CPDF_RenderOptions* pOptions,
-              const CFX_AffineMatrix* pFinalMatrix);
+              const CFX_Matrix* pFinalMatrix);
   friend class CPDF_RenderStatus;
   friend class CPDF_ProgressiveRenderer;
 };
 
 class CPDF_ProgressiveRenderer {
  public:
   // Must match FDF_RENDER_* definitions in public/fpdf_progressive.h, but
   // cannot #include that header. fpdfsdk/src/fpdf_progressive.cpp has
   // static_asserts to make sure the two sets of values match.
   enum Status {
@@ skipping 38 matching lines @@
                              CPDF_Font* pFont,
                              int height,
                              const CFX_ByteString& str,
                              FX_ARGB argb);
 
   static void DrawTextString(CFX_RenderDevice* pDevice,
                              FX_FLOAT origin_x,
                              FX_FLOAT origin_y,
                              CPDF_Font* pFont,
                              FX_FLOAT font_size,
-                             const CFX_AffineMatrix* matrix,
+                             const CFX_Matrix* matrix,
                              const CFX_ByteString& str,
                              FX_ARGB fill_argb,
                              FX_ARGB stroke_argb = 0,
                              const CFX_GraphStateData* pGraphState = NULL,
                              const CPDF_RenderOptions* pOptions = NULL);
 
   static FX_BOOL DrawTextPath(CFX_RenderDevice* pDevice,
                               int nChars,
                               FX_DWORD* pCharCodes,
                               FX_FLOAT* pCharPos,
                               CPDF_Font* pFont,
                               FX_FLOAT font_size,
-                              const CFX_AffineMatrix* pText2User,
-                              const CFX_AffineMatrix* pUser2Device,
+                              const CFX_Matrix* pText2User,
+                              const CFX_Matrix* pUser2Device,
                               const CFX_GraphStateData* pGraphState,
                               FX_ARGB fill_argb,
                               FX_ARGB stroke_argb,
                               CFX_PathData* pClippingPath,
                               int nFlag = 0);
 
   static FX_BOOL DrawNormalText(CFX_RenderDevice* pDevice,
                                 int nChars,
                                 FX_DWORD* pCharCodes,
                                 FX_FLOAT* pCharPos,
                                 CPDF_Font* pFont,
                                 FX_FLOAT font_size,
-                                const CFX_AffineMatrix* pText2Device,
+                                const CFX_Matrix* pText2Device,
                                 FX_ARGB fill_argb,
                                 const CPDF_RenderOptions* pOptions);
 
   static FX_BOOL DrawType3Text(CFX_RenderDevice* pDevice,
                                int nChars,
                                FX_DWORD* pCharCodes,
                                FX_FLOAT* pCharPos,
                                CPDF_Font* pFont,
                                FX_FLOAT font_size,
-                               const CFX_AffineMatrix* pText2Device,
+                               const CFX_Matrix* pText2Device,
                                FX_ARGB fill_argb);
 };
 class CPDF_PageRenderCache {
  public:
   CPDF_PageRenderCache(CPDF_Page* pPage) {
     m_pPage = pPage;
     m_nTimeCount = 0;
     m_nCacheSize = 0;
     m_pCurImageCache = NULL;
     m_bCurFindCache = FALSE;
@@ skipping 45 matching lines @@
   FX_BOOL m_bCurFindCache;
 };
 class CPDF_RenderConfig {
  public:
   CPDF_RenderConfig();
   ~CPDF_RenderConfig();
   int m_HalftoneLimit;
   int m_RenderStepLimit;
 };
 
-FX_BOOL IsAvailableMatrix(const CFX_AffineMatrix& matrix);
+FX_BOOL IsAvailableMatrix(const CFX_Matrix& matrix);
 
 #endif  // CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_