From 22b05fc0f0cbfd3841b0963b577719fd16725081 Mon Sep 17 00:00:00 2001 From: tsepez Date: Mon, 25 Jul 2016 13:40:11 -0700 Subject: Remove FX_FONTCACHE_DEFINE This macro isn't buying us anything and reduces transparency. Review-Url: https://codereview.chromium.org/2179953002 --- core/fxge/ge/fx_ge_text.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/fxge/ge') diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp index db86d65067..c97b88e27b 100644 --- a/core/fxge/ge/fx_ge_text.cpp +++ b/core/fxge/ge/fx_ge_text.cpp @@ -479,7 +479,7 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, pCache = CFX_GEModule::Get()->GetFontCache(); CFX_FaceCache* pFaceCache = pCache->GetCachedFace(pFont); - FX_FONTCACHE_DEFINE(pCache, pFont); + CFX_AutoFontCache autoFontCache(pCache, pFont); std::vector glyphs(nChars); CFX_Matrix matrixCTM = GetCTM(); FX_FLOAT scale_x = FXSYS_fabs(matrixCTM.a); @@ -634,7 +634,7 @@ FX_BOOL CFX_RenderDevice::DrawTextPathWithFlags( 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; -- cgit v1.2.3