summaryrefslogtreecommitdiff
path: root/core/include
diff options
context:
space:
mode:
authorcaryclark <caryclark@google.com>2016-04-04 12:27:16 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-04 12:27:17 -0700
commitf8a5ef3056619c1a8e7d1108ac3720c97ca8e67d (patch)
tree8cdf3d66a50aa8a363631d62762b64f42d4258d7 /core/include
parent221caf6f6f9810cbc0e0c4c50af9b036a052ae13 (diff)
downloadpdfium-f8a5ef3056619c1a8e7d1108ac3720c97ca8e67d.tar.xz
Support the device font cache
Reuse the Skia typeface on sucessive text draw calls. This reduces the SKP size by 100x for some documents. Note that this does not use a smart pointer for the Skia typeface object. The downside of doing so is that it requires all clients that include fx_font.h to also have access to Skia. In this specific case, it is preferable to have a forward declared class to isolate Skia from the rest of PDFium. R=dsinclair,tsepez@chromium.org Review URL: https://codereview.chromium.org/1837113004
Diffstat (limited to 'core/include')
-rw-r--r--core/include/fxge/fx_font.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index c52e614e97..4e2b97e677 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -27,6 +27,12 @@ class CFX_SubstFont;
class CTTFontDesc;
class IFX_SystemFontInfo;
+#ifdef _SKIA_SUPPORT_
+class SkTypeface;
+
+using CFX_TypeFace = SkTypeface;
+#endif
+
#define FXFONT_FIXED_PITCH 0x01
#define FXFONT_SERIF 0x02
#define FXFONT_SYMBOLIC 0x04
@@ -452,6 +458,9 @@ class CFX_FontCache {
CFX_FaceCache* GetCachedFace(CFX_Font* pFont);
void ReleaseCachedFace(CFX_Font* pFont);
void FreeCache(FX_BOOL bRelease = FALSE);
+#ifdef _SKIA_SUPPORT_
+ CFX_TypeFace* GetDeviceCache(CFX_Font* pFont);
+#endif
private:
using CFX_FTCacheMap = std::map<FXFT_Face, CFX_CountedFaceCache*>;
@@ -490,6 +499,10 @@ class CFX_FaceCache {
uint32_t glyph_index,
int dest_width);
+#ifdef _SKIA_SUPPORT_
+ CFX_TypeFace* GetDeviceCache(CFX_Font* pFont);
+#endif
+
private:
CFX_GlyphBitmap* RenderGlyph(CFX_Font* pFont,
uint32_t glyph_index,
@@ -516,6 +529,9 @@ class CFX_FaceCache {
std::map<CFX_ByteString, CFX_SizeGlyphCache*> m_SizeMap;
std::map<uint32_t, CFX_PathData*> m_PathMap;
CFX_DIBitmap* m_pBitmap;
+#ifdef _SKIA_SUPPORT_
+ CFX_TypeFace* m_pTypeface;
+#endif
};
struct FXTEXT_GLYPHPOS {