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/skia/fx_skia_device.cpp | 27 ++++++++------------------- core/fxge/skia/fx_skia_device.h | 2 -- core/fxge/skia/fx_skia_device_unittest.cpp | 10 ++++------ 3 files changed, 12 insertions(+), 27 deletions(-) (limited to 'core/fxge/skia') diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index d2e4abce92..b1c47bfedf 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -14,7 +14,6 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" #include "core/fxge/include/cfx_graphstatedata.h" @@ -486,7 +485,6 @@ class SkiaState { // mark all cached state as uninitialized SkiaState() : m_pFont(nullptr), - m_pCache(nullptr), m_fontSize(0), m_fillColor(0), m_strokeColor(0), @@ -580,7 +578,6 @@ class SkiaState { bool DrawText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pMatrix, FX_FLOAT font_size, uint32_t color, @@ -591,13 +588,12 @@ class SkiaState { FlushCommands(pDriver); if (m_drawPath) FlushPath(pDriver); - if (m_drawText && FontChanged(pFont, pCache, pMatrix, font_size, color)) + if (m_drawText && FontChanged(pFont, pMatrix, font_size, color)) FlushText(pDriver); if (!m_drawText) { m_positions.setCount(0); m_glyphs.setCount(0); m_pFont = pFont; - m_pCache = pCache; m_fontSize = font_size; m_fillColor = color; m_drawMatrix = *pMatrix; @@ -626,8 +622,8 @@ class SkiaState { SkPaint skPaint; skPaint.setAntiAlias(true); skPaint.setColor(m_fillColor); - if (m_pFont->GetFace() && m_pCache) { // exclude placeholder test fonts - sk_sp typeface(SkSafeRef(m_pCache->GetDeviceCache(m_pFont))); + if (m_pFont->GetFace()) { // exclude placeholder test fonts + sk_sp typeface(SkSafeRef(m_pFont->GetDeviceCache())); skPaint.setTypeface(typeface); } skPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); @@ -783,13 +779,11 @@ class SkiaState { } bool FontChanged(CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pMatrix, FX_FLOAT font_size, uint32_t color) { - return pFont != m_pFont || pCache != m_pCache || - MatrixChanged(pMatrix, m_drawMatrix) || font_size != m_fontSize || - color != m_fillColor; + return pFont != m_pFont || MatrixChanged(pMatrix, m_drawMatrix) || + font_size != m_fontSize || color != m_fillColor; } bool MatrixChanged(const CFX_Matrix* pMatrix, const CFX_Matrix& refMatrix) { @@ -872,7 +866,6 @@ class SkiaState { CFX_GraphStateData m_drawState; CFX_Matrix m_clipMatrix; CFX_Font* m_pFont; - CFX_FontCache* m_pCache; FX_FLOAT m_fontSize; uint32_t m_fillColor; uint32_t m_strokeColor; @@ -1005,18 +998,14 @@ void CFX_SkiaDeviceDriver::Flush() { FX_BOOL CFX_SkiaDeviceDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont, - CFX_FontCache* pCache, const CFX_Matrix* pObject2Device, FX_FLOAT font_size, uint32_t color) { - if (!pCache) - pCache = CFX_GEModule::Get()->GetFontCache(); - if (m_pCache->DrawText(nChars, pCharPos, pFont, pCache, pObject2Device, - font_size, color, this)) { + if (m_pCache->DrawText(nChars, pCharPos, pFont, pObject2Device, font_size, + color, this)) { return TRUE; } - sk_sp typeface( - SkSafeRef(pCache ? pCache->GetDeviceCache(pFont) : nullptr)); + sk_sp typeface(SkSafeRef(pFont->GetDeviceCache())); SkPaint paint; paint.setAntiAlias(true); paint.setColor(color); diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index 8a1bf690b2..78d8e32ebc 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -10,7 +10,6 @@ #include "core/fxge/include/cfx_pathdata.h" #include "core/fxge/include/ifx_renderdevicedriver.h" -class CFX_FontCache; class SkCanvas; class SkMatrix; class SkPaint; @@ -122,7 +121,6 @@ class CFX_SkiaDeviceDriver : 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; diff --git a/core/fxge/skia/fx_skia_device_unittest.cpp b/core/fxge/skia/fx_skia_device_unittest.cpp index 5162e9cbde..5666feea9f 100644 --- a/core/fxge/skia/fx_skia_device_unittest.cpp +++ b/core/fxge/skia/fx_skia_device_unittest.cpp @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fxge/include/cfx_fontcache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" #include "core/fxge/include/cfx_pathdata.h" @@ -39,7 +38,6 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { FXTEXT_CHARPOS charPos[] = {{{0, 0, 0, 0}, 0, 1, 1, 4, false, false}}; CFX_Font font; FX_FLOAT fontSize = 1; - CFX_FontCache cache; CFX_PathData clipPath, clipPath2; clipPath.AppendRect(0, 0, 3, 1); clipPath2.AppendRect(0, 0, 2, 1); @@ -59,8 +57,8 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { driver->DrawPath(&path1, &matrix, &graphState, 0xFF112233, 0, FXFILL_WINDING, 0); } else if (state.m_graphic == State::Graphic::kText) { - driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &cache, - &matrix, fontSize, 0xFF445566); + driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &matrix, + fontSize, 0xFF445566); } if (state.m_save == State::Save::kYes) driver->RestoreState(true); @@ -82,8 +80,8 @@ void CommonTest(CFX_SkiaDeviceDriver* driver, const State& state) { driver->DrawPath(&path2, &matrix2, &graphState, 0xFF112233, 0, FXFILL_WINDING, 0); } else if (state.m_graphic == State::Graphic::kText) { - driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &cache, - &matrix2, fontSize, 0xFF445566); + driver->DrawDeviceText(SK_ARRAY_COUNT(charPos), charPos, &font, &matrix2, + fontSize, 0xFF445566); } if (state.m_save == State::Save::kYes) driver->RestoreState(false); -- cgit v1.2.3