summaryrefslogtreecommitdiff
path: root/core/fxge/android
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-11-07 16:32:20 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-07 16:32:20 +0000
commit979e916fde750e47f262c59dc75f4ca2dc19ed39 (patch)
tree5e767486014c58e384f827f3fd7dc11efe658865 /core/fxge/android
parentf2f12b32b601f022b5c10fddd8c4d19d00072630 (diff)
downloadpdfium-979e916fde750e47f262c59dc75f4ca2dc19ed39.tar.xz
Remove m_bFlagExact from CFX_SubstFont
This CL removes the single use case from |m_bFlagExact|. This flag allows the PDF viewer to treat a substitute font with a matching name as if it was actually an embedded font, which is wrong. For all substitute fonts, it is important to follow the longer process of first obtaining the unicode from the charcode to then obtain the glyph in the substitute font that corresponds to that unicode. Bug: chromium:781785 Change-Id: Ie5958b43914e0e46334b89b7c2c55c02d0da0c11 Reviewed-on: https://pdfium-review.googlesource.com/17859 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Diffstat (limited to 'core/fxge/android')
-rw-r--r--core/fxge/android/cfx_androidfontinfo.cpp3
-rw-r--r--core/fxge/android/cfx_androidfontinfo.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/core/fxge/android/cfx_androidfontinfo.cpp b/core/fxge/android/cfx_androidfontinfo.cpp
index 15ac8c29b2..61d213edd6 100644
--- a/core/fxge/android/cfx_androidfontinfo.cpp
+++ b/core/fxge/android/cfx_androidfontinfo.cpp
@@ -30,8 +30,7 @@ void* CFX_AndroidFontInfo::MapFont(int weight,
bool bItalic,
int charset,
int pitch_family,
- const char* face,
- int& iExact) {
+ const char* face) {
if (!m_pFontMgr)
return nullptr;
diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h
index 653770f095..bf5fae59df 100644
--- a/core/fxge/android/cfx_androidfontinfo.h
+++ b/core/fxge/android/cfx_androidfontinfo.h
@@ -28,8 +28,7 @@ class CFX_AndroidFontInfo : public IFX_SystemFontInfo {
bool bItalic,
int charset,
int pitch_family,
- const char* face,
- int& bExact) override;
+ const char* face) override;
void* GetFont(const char* face) override;
uint32_t GetFontData(void* hFont,
uint32_t table,