From 19ecc23e30f0d5368a703d751afd718a0c6434f6 Mon Sep 17 00:00:00 2001 From: npm Date: Fri, 19 Aug 2016 16:17:57 -0700 Subject: Move CFX_FaceCache to its own file Moved ScopedFontTransform from fx_ge_text namespace to fx_font Moved some arrays used by both CFX_Font and CFX_FaceCache from fx_ge_text to inside CFX_Font class Review-Url: https://codereview.chromium.org/2263623002 --- core/fxge/include/cfx_facecache.h | 64 ++++++++++++++++++++++++++++++++++++ core/fxge/include/cfx_fontcache.h | 2 ++ core/fxge/include/fx_font.h | 68 +++++++++++---------------------------- 3 files changed, 84 insertions(+), 50 deletions(-) create mode 100644 core/fxge/include/cfx_facecache.h (limited to 'core/fxge/include') diff --git a/core/fxge/include/cfx_facecache.h b/core/fxge/include/cfx_facecache.h new file mode 100644 index 0000000000..6e437b49c3 --- /dev/null +++ b/core/fxge/include/cfx_facecache.h @@ -0,0 +1,64 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef CORE_FXGE_INCLUDE_CFX_FACECACHE_H_ +#define CORE_FXGE_INCLUDE_CFX_FACECACHE_H_ + +#include + +#include "core/fxge/include/fx_font.h" +#include "core/fxge/include/fx_freetype.h" + +class CFX_FaceCache { + public: + explicit CFX_FaceCache(FXFT_Face face); + ~CFX_FaceCache(); + const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, + uint32_t glyph_index, + FX_BOOL bFontStyle, + const CFX_Matrix* pMatrix, + int dest_width, + int anti_alias, + int& text_flags); + const CFX_PathData* LoadGlyphPath(CFX_Font* pFont, + 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, + FX_BOOL bFontStyle, + const CFX_Matrix* pMatrix, + int dest_width, + int anti_alias); + CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, + uint32_t glyph_index, + const CFX_Matrix* pMatrix, + int dest_width, + int anti_alias); + CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, + const CFX_Matrix* pMatrix, + const CFX_ByteString& FaceGlyphsKey, + uint32_t glyph_index, + FX_BOOL bFontStyle, + int dest_width, + int anti_alias); + void InitPlatform(); + void DestroyPlatform(); + + FXFT_Face const m_Face; + std::map> m_SizeMap; + std::map> m_PathMap; +#ifdef _SKIA_SUPPORT_ + CFX_TypeFace* m_pTypeface; +#endif +}; + +#endif // CORE_FXGE_INCLUDE_CFX_FACECACHE_H_ diff --git a/core/fxge/include/cfx_fontcache.h b/core/fxge/include/cfx_fontcache.h index 3aee20755d..d4a4dddaa5 100644 --- a/core/fxge/include/cfx_fontcache.h +++ b/core/fxge/include/cfx_fontcache.h @@ -13,6 +13,8 @@ #include "core/fxge/include/fx_font.h" #include "core/fxge/include/fx_freetype.h" +class CFX_FaceCache; + class CFX_FontCache { public: CFX_FontCache(); diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h index e6ffc6be4b..28c51b131c 100644 --- a/core/fxge/include/fx_font.h +++ b/core/fxge/include/fx_font.h @@ -74,6 +74,17 @@ using CFX_TypeFace = SkTypeface; #define GET_TT_LONG(w) \ (uint32_t)(((w)[0] << 24) | ((w)[1] << 16) | ((w)[2] << 8) | (w)[3]) +// Sets the given transform on the font, and resets it to the identity when it +// goes out of scope. +class ScopedFontTransform { + public: + ScopedFontTransform(FT_Face face, FXFT_Matrix* matrix); + ~ScopedFontTransform(); + + private: + FT_Face m_Face; +}; + class CFX_Font { public: CFX_Font(); @@ -132,6 +143,13 @@ class CFX_Font { uint32_t GetSize() const { return m_dwSize; } void AdjustMMParams(int glyph_index, int width, int weight); + static const size_t kAngleSkewArraySize = 30; + static const char s_AngleSkew[kAngleSkewArraySize]; + static const size_t kWeightPowArraySize = 100; + static const uint8_t s_WeightPow[kWeightPowArraySize]; + static const uint8_t s_WeightPow_11[kWeightPowArraySize]; + static const uint8_t s_WeightPow_SHIFTJIS[kWeightPowArraySize]; + #ifdef PDF_ENABLE_XFA protected: CFX_BinaryBuf m_OtfFontData; @@ -243,56 +261,6 @@ class CFX_GlyphBitmap { CFX_DIBitmap m_Bitmap; }; -class CFX_FaceCache { - public: - explicit CFX_FaceCache(FXFT_Face face); - ~CFX_FaceCache(); - const CFX_GlyphBitmap* LoadGlyphBitmap(CFX_Font* pFont, - uint32_t glyph_index, - FX_BOOL bFontStyle, - const CFX_Matrix* pMatrix, - int dest_width, - int anti_alias, - int& text_flags); - const CFX_PathData* LoadGlyphPath(CFX_Font* pFont, - 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, - FX_BOOL bFontStyle, - const CFX_Matrix* pMatrix, - int dest_width, - int anti_alias); - CFX_GlyphBitmap* RenderGlyph_Nativetext(CFX_Font* pFont, - uint32_t glyph_index, - const CFX_Matrix* pMatrix, - int dest_width, - int anti_alias); - CFX_GlyphBitmap* LookUpGlyphBitmap(CFX_Font* pFont, - const CFX_Matrix* pMatrix, - const CFX_ByteString& FaceGlyphsKey, - uint32_t glyph_index, - FX_BOOL bFontStyle, - int dest_width, - int anti_alias); - void InitPlatform(); - void DestroyPlatform(); - - FXFT_Face const m_Face; - std::map m_SizeMap; - std::map m_PathMap; - CFX_DIBitmap* m_pBitmap; -#ifdef _SKIA_SUPPORT_ - CFX_TypeFace* m_pTypeface; -#endif -}; - struct FXTEXT_GLYPHPOS { const CFX_GlyphBitmap* m_pGlyph; int m_OriginX; -- cgit v1.2.3