diff options
| author | art-snake <art-snake@yandex-team.ru> | 2016-09-20 07:46:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-09-20 07:46:26 -0700 |
| commit | 9972ff99285cea12a20026136e98c1e635a15010 (patch) | |
| tree | 7ddd9c0a49329baccd0e570fe064527b794c1fde /core/fxge/apple | |
| parent | 717d1330bafb846e4cd25bfb4952bfdedce0db91 (diff) | |
| download | pdfium-9972ff99285cea12a20026136e98c1e635a15010.tar.xz | |
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
Diffstat (limited to 'core/fxge/apple')
| -rw-r--r-- | core/fxge/apple/apple_int.h | 4 | ||||
| -rw-r--r-- | core/fxge/apple/fx_apple_platform.cpp | 9 | ||||
| -rw-r--r-- | core/fxge/apple/fx_quartz_device.cpp | 13 |
3 files changed, 8 insertions, 18 deletions
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h index a401086f35..9443b5da01 100644 --- a/core/fxge/apple/apple_int.h +++ b/core/fxge/apple/apple_int.h @@ -21,8 +21,6 @@ #include <Carbon/Carbon.h> #endif -class CFX_FontCache; - class CQuartz2D { public: void* createGraphics(CFX_DIBitmap* bitmap); @@ -110,7 +108,6 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { 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; @@ -127,7 +124,6 @@ class CFX_QuartzDeviceDriver : public IFX_RenderDeviceDriver { FX_BOOL CG_DrawGlyphRun(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pGlyphMatrix, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index be429e9a43..239a6e50f9 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -18,7 +18,6 @@ #include "core/fxge/ge/cfx_cliprgn.h" #include "core/fxge/ge/fx_text_int.h" #include "core/fxge/include/cfx_facecache.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxge/include/fx_freetype.h" @@ -33,7 +32,6 @@ FX_BOOL CGDrawGlyphRun(CGContextRef pContext, int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -106,7 +104,6 @@ void CFX_AggDeviceDriver::DestroyPlatform() { FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t argb) { @@ -155,8 +152,8 @@ FX_BOOL CFX_AggDeviceDriver::DrawDeviceText(int nChars, else CGContextClipToRect(ctx, rect_cg); - FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pCache, - pObject2Device, font_size, argb); + FX_BOOL ret = CGDrawGlyphRun(ctx, nChars, pCharPos, pFont, pObject2Device, + font_size, argb); if (pImageCG) CGImageRelease(pImageCG); CGContextRestoreGState(ctx); @@ -170,7 +167,7 @@ void CFX_FaceCache::InitPlatform() {} void CFX_FaceCache::DestroyPlatform() {} CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph_Nativetext( - CFX_Font* pFont, + const CFX_Font* pFont, uint32_t glyph_index, const CFX_Matrix* pMatrix, int dest_width, diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 400e29085c..6a0260b1d6 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -13,7 +13,6 @@ #include "core/fxcrt/include/fx_memory.h" #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_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" @@ -746,7 +745,6 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlyphRun( int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pGlyphMatrix, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, @@ -812,7 +810,6 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlyphRun( FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { @@ -832,8 +829,8 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, while (i < nChars) { if (pCharPos[i].m_bGlyphAdjust || font_size < 0) { if (i > 0) { - ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, - pObject2Device, font_size, color); + ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, + font_size, color); if (!ret) { RestoreState(false); return ret; @@ -849,8 +846,8 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, char_pos->m_AdjustMatrix[0], char_pos->m_AdjustMatrix[1], char_pos->m_AdjustMatrix[2], char_pos->m_AdjustMatrix[3], 0, 0); } - ret = CG_DrawGlyphRun(1, char_pos, pFont, pCache, &glphy_matrix, - pObject2Device, font_size, color); + ret = CG_DrawGlyphRun(1, char_pos, pFont, &glphy_matrix, pObject2Device, + font_size, color); if (!ret) { RestoreState(false); return ret; @@ -864,7 +861,7 @@ FX_BOOL CFX_QuartzDeviceDriver::DrawDeviceText(int nChars, } } if (i > 0) { - ret = CG_DrawGlyphRun(i, pCharPos, pFont, pCache, nullptr, pObject2Device, + ret = CG_DrawGlyphRun(i, pCharPos, pFont, nullptr, pObject2Device, font_size, color); } RestoreState(false); |