Merge to XFA: Remove CFX_AffineMatrix/CPDF_Matrix

core/src/fxge/ge/fx_ge_text.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"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "text_int.h"
@@ skipping 158 matching lines @@
                      bgra[1], bgra[0]);
   bgra[3] = (alpha_flag >> 24) ? FXGETFLAG_ALPHA_FILL(alpha_flag)
                                : FXGETFLAG_ALPHA_STROKE(alpha_flag);
   argb = FXARGB_MAKE(bgra[3], bgra[2], bgra[1], bgra[0]);
 }
 FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,
                                          const FXTEXT_CHARPOS* pCharPos,
                                          CFX_Font* pFont,
                                          CFX_FontCache* pCache,
                                          FX_FLOAT font_size,
-                                         const CFX_AffineMatrix* pText2Device,
+                                         const CFX_Matrix* pText2Device,
                                          FX_DWORD fill_color,
                                          FX_DWORD text_flags,
                                          int alpha_flag,
                                          void* pIccTransform) {
   int nativetext_flags = text_flags;
   if (m_DeviceClass != FXDC_DISPLAY) {
     if (!(text_flags & FXTEXT_PRINTGRAPHICTEXT)) {
       bool should_call_draw_device_text = true;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
       if ((text_flags & FXFONT_CIDFONT) ||
@@ skipping 23 matching lines @@
       should_call_draw_device_text = false;
     }
 #endif
     if (should_call_draw_device_text &&
         m_pDeviceDriver->DrawDeviceText(nChars, pCharPos, pFont, pCache,
                                         pText2Device, font_size, fill_color,
                                         alpha_flag, pIccTransform)) {
       return TRUE;
     }
   }
-  CFX_AffineMatrix char2device, deviceCtm, text2Device;
+  CFX_Matrix char2device, deviceCtm, text2Device;
   if (pText2Device) {
     char2device = *pText2Device;
     text2Device = *pText2Device;
   }
   char2device.Scale(font_size, -font_size);
   if (FXSYS_fabs(char2device.a) + FXSYS_fabs(char2device.b) > 50 * 1.0f ||
       ((m_DeviceClass == FXDC_PRINTER && !m_pDeviceDriver->IsPSPrintDriver()) &&
        !(text_flags & FXTEXT_PRINTIMAGETEXT))) {
     if (pFont->GetFace() != NULL ||
         (pFont->GetSubstFont()->m_SubstFlags & FXFONT_SUBST_GLYPHPATH)) {
@@ skipping 31 matching lines @@
     }
   }
   if (pCache == NULL) {
     pCache = CFX_GEModule::Get()->GetFontCache();
   }
   CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont);
   FX_FONTCACHE_DEFINE(pCache, pFont);
   FXTEXT_GLYPHPOS* pGlyphAndPos = FX_Alloc(FXTEXT_GLYPHPOS, nChars);
   int iChar;
   deviceCtm = char2device;
-  CFX_AffineMatrix matrixCTM = GetCTM();
+  CFX_Matrix matrixCTM = GetCTM();
   FX_FLOAT scale_x = FXSYS_fabs(matrixCTM.a);
   FX_FLOAT scale_y = FXSYS_fabs(matrixCTM.d);
   deviceCtm.Concat(scale_x, 0, 0, scale_y, 0, 0);
   text2Device.Concat(scale_x, 0, 0, scale_y, 0, 0);
   for (iChar = 0; iChar < nChars; iChar++) {
     FXTEXT_GLYPHPOS& glyph = pGlyphAndPos[iChar];
     const FXTEXT_CHARPOS& charpos = pCharPos[iChar];
     glyph.m_fOriginX = charpos.m_OriginX;
     glyph.m_fOriginY = charpos.m_OriginY;
     text2Device.Transform(glyph.m_fOriginX, glyph.m_fOriginY);
     if (anti_alias < FXFT_RENDER_MODE_LCD) {
       glyph.m_OriginX = FXSYS_round(glyph.m_fOriginX);
     } else {
       glyph.m_OriginX = (int)FXSYS_floor(glyph.m_fOriginX);
     }
     glyph.m_OriginY = FXSYS_round(glyph.m_fOriginY);
     if (charpos.m_bGlyphAdjust) {
-      CFX_AffineMatrix new_matrix(
+      CFX_Matrix new_matrix(
           charpos.m_AdjustMatrix[0], charpos.m_AdjustMatrix[1],
           charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3], 0, 0);
       new_matrix.Concat(deviceCtm);
       glyph.m_pGlyph = pFaceCache->LoadGlyphBitmap(
           pFont, charpos.m_GlyphIndex, charpos.m_bFontStyle, &new_matrix,
           charpos.m_FontCharWidth, anti_alias, nativetext_flags);
     } else {
       glyph.m_pGlyph = pFaceCache->LoadGlyphBitmap(
           pFont, charpos.m_GlyphIndex, charpos.m_bFontStyle, &deviceCtm,
           charpos.m_FontCharWidth, anti_alias, nativetext_flags);
@@ skipping 797 matching lines @@
     SetDIBits(&bitmap, bmp_rect.left, bmp_rect.top);
   }
   FX_Free(pGlyphAndPos);
   return TRUE;
 }
 FX_BOOL CFX_RenderDevice::DrawTextPath(int nChars,
                                        const FXTEXT_CHARPOS* pCharPos,
                                        CFX_Font* pFont,
                                        CFX_FontCache* pCache,
                                        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_DWORD fill_color,
                                        FX_ARGB stroke_color,
                                        CFX_PathData* pClippingPath,
                                        int nFlag,
                                        int alpha_flag,
                                        void* pIccTransform,
                                        int blend_type) {
   if (pCache == NULL) {
     pCache = CFX_GEModule::Get()->GetFontCache();
   }
   CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont);
   FX_FONTCACHE_DEFINE(pCache, pFont);
   for (int iChar = 0; iChar < nChars; iChar++) {
     const FXTEXT_CHARPOS& charpos = pCharPos[iChar];
-    CFX_AffineMatrix matrix;
+    CFX_Matrix matrix;
     if (charpos.m_bGlyphAdjust)
       matrix.Set(charpos.m_AdjustMatrix[0], charpos.m_AdjustMatrix[1],
                  charpos.m_AdjustMatrix[2], charpos.m_AdjustMatrix[3], 0, 0);
     matrix.Concat(font_size, 0, 0, font_size, charpos.m_OriginX,
                   charpos.m_OriginY);
     const CFX_PathData* pPath = pFaceCache->LoadGlyphPath(
         pFont, charpos.m_GlyphIndex, charpos.m_FontCharWidth);
     if (pPath == NULL) {
       continue;
     }
@@ skipping 106 matching lines @@
     m_PathMap.GetNextAssoc(pos, key1, (void*&)pPath);
     delete pPath;
   }
   m_PathMap.RemoveAll();
 }
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
 void CFX_FaceCache::InitPlatform() {}
 #endif
 CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
     CFX_Font* pFont,
-    const CFX_AffineMatrix* pMatrix,
+    const CFX_Matrix* pMatrix,
     CFX_ByteStringC& FaceGlyphsKey,
     FX_DWORD glyph_index,
     FX_BOOL bFontStyle,
     int dest_width,
     int anti_alias) {
   CFX_SizeGlyphCache* pSizeCache;
   auto it = m_SizeMap.find(FaceGlyphsKey);
   if (it == m_SizeMap.end()) {
     pSizeCache = new CFX_SizeGlyphCache;
     m_SizeMap[FaceGlyphsKey] = pSizeCache;
   } else {
     pSizeCache = it->second;
   }
   CFX_GlyphBitmap* pGlyphBitmap = NULL;
   if (pSizeCache->m_GlyphMap.Lookup((void*)(uintptr_t)glyph_index,
                                     (void*&)pGlyphBitmap)) {
     return pGlyphBitmap;
   }
   pGlyphBitmap = RenderGlyph(pFont, glyph_index, bFontStyle, pMatrix,
                              dest_width, anti_alias);
   if (pGlyphBitmap == NULL) {
     return NULL;
   }
   pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
   return pGlyphBitmap;
 }
-const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(
-    CFX_Font* pFont,
-    FX_DWORD glyph_index,
-    FX_BOOL bFontStyle,
-    const CFX_AffineMatrix* pMatrix,
-    int dest_width,
-    int anti_alias,
-    int& text_flags) {
+const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
+                                                      FX_DWORD glyph_index,
+                                                      FX_BOOL bFontStyle,
+                                                      const CFX_Matrix* pMatrix,
+                                                      int dest_width,
+                                                      int anti_alias,
+                                                      int& text_flags) {
   if (glyph_index == (FX_DWORD)-1) {
     return NULL;
   }
   _CFX_UniqueKeyGen keygen;
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
   if (pFont->GetSubstFont())
     keygen.Generate(9, (int)(pMatrix->a * 10000), (int)(pMatrix->b * 10000),
                     (int)(pMatrix->c * 10000), (int)(pMatrix->d * 10000),
                     dest_width, anti_alias, pFont->GetSubstFont()->m_Weight,
                     pFont->GetSubstFont()->m_ItalicAngle, pFont->IsVertical());
@@ skipping 211 matching lines @@
       } else if (temp < 0) {
         temp = 0;
       }
       *pDstRow++ = (uint8_t)temp;
     }
   }
 }
 CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont,
                                             FX_DWORD glyph_index,
                                             FX_BOOL bFontStyle,
-                                            const CFX_AffineMatrix* pMatrix,
+                                            const CFX_Matrix* pMatrix,
                                             int dest_width,
                                             int anti_alias) {
   if (m_Face == NULL) {
     return NULL;
   }
   FXFT_Matrix ft_matrix;
   ft_matrix.xx = (signed long)(pMatrix->GetA() / 64 * 65536);
   ft_matrix.xy = (signed long)(pMatrix->GetC() / 64 * 65536);
   ft_matrix.yx = (signed long)(pMatrix->GetB() / 64 * 65536);
   ft_matrix.yy = (signed long)(pMatrix->GetD() / 64 * 65536);
@@ skipping 341 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((FX_DWORD*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(FX_DWORD);
 }