From 9972ff99285cea12a20026136e98c1e635a15010 Mon Sep 17 00:00:00 2001 From: art-snake Date: Tue, 20 Sep 2016 07:46:25 -0700 Subject: Refactor CFX_FontCache to have only one in GE Module. After this CL: only one global CFX_FontCache used. Any cached items from it, are released, when they are not being used. This is restore part of reverted CL: Original CL: https://codereview.chromium.org/2158023002 Revert reason: BUG=647612 Fix bug CL: https://codereview.chromium.org/2350193003 Review-Url: https://codereview.chromium.org/2350243002 --- core/fxge/win32/fx_win32_print.cpp | 2 -- core/fxge/win32/win32_int.h | 2 -- 2 files changed, 4 deletions(-) (limited to 'core/fxge/win32') diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index bc5bb92d5e..2a52a60ce6 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -14,7 +14,6 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/ge/fx_text_int.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/cfx_windowsdevice.h" #include "core/fxge/include/fx_freetype.h" @@ -199,7 +198,6 @@ FX_BOOL CGdiPrinterDriver::StartDIBits(const CFX_DIBSource* pSource, FX_BOOL CGdiPrinterDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index 8c3443b3fd..7e35793675 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -11,7 +11,6 @@ #include "core/fxge/include/ifx_renderdevicedriver.h" #include "core/fxge/win32/dwrite_int.h" -class CFX_FontCache; struct FXTEXT_CHARPOS; struct WINDIB_Open_Args_; @@ -246,7 +245,6 @@ class CGdiPrinterDriver : public CGdiDeviceDriver { FX_BOOL DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) override; -- cgit v1.2.3