Remove FX_FONTCACHE_DEFINE

core/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 <limits>
 #include <vector>
 
 #include "core/fxcodec/include/fx_codec.h"
@@ skipping 461 matching lines @@
           bClearType = !!(text_flags & FXTEXT_CLEARTYPE);
         }
         bNormal = !bClearType;
       }
     }
   }
   if (!pCache)
     pCache = CFX_GEModule::Get()->GetFontCache();
 
   CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont);
-  FX_FONTCACHE_DEFINE(pCache, pFont);
+  CFX_AutoFontCache autoFontCache(pCache, pFont);
   std::vector<FXTEXT_GLYPHPOS> glyphs(nChars);
   CFX_Matrix matrixCTM = GetCTM();
   FX_FLOAT scale_x = FXSYS_fabs(matrixCTM.a);
   FX_FLOAT scale_y = FXSYS_fabs(matrixCTM.d);
   CFX_Matrix deviceCtm = char2device;
   deviceCtm.Concat(scale_x, 0, 0, scale_y, 0, 0);
   text2Device.Concat(scale_x, 0, 0, scale_y, 0, 0);
   for (size_t i = 0; i < glyphs.size(); ++i) {
     FXTEXT_GLYPHPOS& glyph = glyphs[i];
     const FXTEXT_CHARPOS& charpos = pCharPos[i];
@@ skipping 134 matching lines @@
     const CFX_Matrix* pUser2Device,
     const CFX_GraphStateData* pGraphState,
     uint32_t fill_color,
     FX_ARGB stroke_color,
     CFX_PathData* pClippingPath,
     int nFlag) {
   if (!pCache)
     pCache = CFX_GEModule::Get()->GetFontCache();
 
   CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont);
-  FX_FONTCACHE_DEFINE(pCache, pFont);
+  CFX_AutoFontCache autoFontCache(pCache, pFont);
   for (int iChar = 0; iChar < nChars; iChar++) {
     const FXTEXT_CHARPOS& charpos = pCharPos[iChar];
     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);
@@ skipping 754 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);
     ((uint32_t*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(uint32_t);
 }