diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 16:58:33 -0800 |
| commit | d983b09c3ae29a97cba8e9ec9c6351545f6087ee (patch) | |
| tree | 5641a4bc6eddaa8069904c29c3e3897043411646 /core/src/fxge/android | |
| parent | f86d3f946e2f1977c7eaea01dcb9d7ecb3064cd1 (diff) | |
| download | pdfium-d983b09c3ae29a97cba8e9ec9c6351545f6087ee.tar.xz | |
Merge to XFA: Remove FX_BSTRC.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1521563002 .
(cherry picked from commit 1956a174020686f91cd3b34294e91f4560fe45aa)
Review URL: https://codereview.chromium.org/1526823002 .
Diffstat (limited to 'core/src/fxge/android')
| -rw-r--r-- | core/src/fxge/android/fpf_skiafontmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index a263416521..254f806fec 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -247,7 +247,7 @@ void CFPF_SkiaFontMgr::LoadSystemFonts() { if (m_bLoaded) { return; } - ScanPath(FX_BSTRC("/system/fonts")); + ScanPath("/system/fonts"); OutputSystemFonts(); m_bLoaded = TRUE; } @@ -416,13 +416,13 @@ void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) { FX_BOOL bFolder = FALSE; while (FX_GetNextFile(handle, filename, bFolder)) { if (bFolder) { - if (filename == FX_BSTRC(".") || filename == FX_BSTRC("..")) { + if (filename == "." || filename == "..") { continue; } } else { CFX_ByteString ext = filename.Right(4); ext.MakeLower(); - if (ext != FX_BSTRC(".ttf") && ext != FX_BSTRC(".ttc")) { + if (ext != ".ttf" && ext != ".ttc" && ext != ".otf") { continue; } } |