Unreviewed changes
10 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:
```
The name of the file: core/fxge/cfx_glyphcache.h
Insertions: 3, Deletions: 3.
@@ -54,12 +54,12 @@
using WidthMapKey = std::tuple<uint32_t, int, int>;
std::unique_ptr<CFX_GlyphBitmap> RenderGlyph(uint32_t glyph_index,
- bool bFontStyle,
- bool bIsVertical,
+ bool font_style,
+ bool is_vertical,
const CFX_Matrix& matrix,
int dest_width,
FontAntiAliasingMode anti_alias,
- const CFX_SubstFont* pSubstFont);
+ const CFX_SubstFont* subst_font);
CFX_GlyphBitmap* LookUpGlyphBitmap(const CFX_Font* font,
const CFX_Matrix& matrix,
const ByteString& FaceGlyphsKey,
```
```
The name of the file: core/fxge/cfx_glyphcache.cpp
Insertions: 5, Deletions: 5.
@@ -104,17 +104,17 @@
std::unique_ptr<CFX_GlyphBitmap> CFX_GlyphCache::RenderGlyph(
uint32_t glyph_index,
- bool bFontStyle,
- bool bIsVertical,
+ bool font_style,
+ bool is_vertical,
const CFX_Matrix& matrix,
int dest_width,
FontAntiAliasingMode anti_alias,
- const CFX_SubstFont* pSubstFont) {
+ const CFX_SubstFont* subst_font) {
if (!face_) {
return nullptr;
}
- return face_->RenderGlyph(glyph_index, bFontStyle, bIsVertical, matrix,
- dest_width, anti_alias, pSubstFont);
+ return face_->RenderGlyph(glyph_index, font_style, is_vertical, matrix,
+ dest_width, anti_alias, subst_font);
}
const CFX_Path* CFX_GlyphCache::LoadGlyphPath(const CFX_Font* font,
```
Change information
Commit message:
Better separate CFX_Font from CFX_Face
The checks in PS#1 show that the items that the face retrieves from
the font are already present, except for a bIsVertical flag. Achieve
better layering between the two classes.
-- Fix missing forward in cfx_fontmgr.h.
-- Comment purpose of CFX_SubstFont.
Change-Id: I3bd730a6a8d3a75ee3cea5c800df61e915ae2c4d
Files:
- M core/fxge/cfx_face.cpp
- M core/fxge/cfx_face.h
- M core/fxge/cfx_fontmgr.h
- M core/fxge/cfx_glyphcache.cpp
- M core/fxge/cfx_glyphcache.h
- M core/fxge/cfx_substfont.h
Change size: M
Delta: 6 files changed, 37 insertions(+), 34 deletions(-)
Branch: refs/heads/main
Submit Requirements:
Code-Review: +1 by Lei Zhang