summaryrefslogtreecommitdiff
path: root/core/src/fxge
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-10-16 16:29:59 -0700
committerLei Zhang <thestig@chromium.org>2015-10-16 16:29:59 -0700
commit0c6e6824979c9a3e7006a925f7b307db04342146 (patch)
tree12be3af6450fbb37cc5c12247eea888c9cf09d11 /core/src/fxge
parentc40ccaff017691b7d31e0597863bfb954aebd739 (diff)
downloadpdfium-0c6e6824979c9a3e7006a925f7b307db04342146.tar.xz
Merge to XFA: Don't bother passing -1 as the length to the CFX_ByteString ctor.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1406363002 . (cherry picked from commit 316e482630d5f5d9084edd9725f98a0d89a5bbdf) Review URL: https://codereview.chromium.org/1406303006 .
Diffstat (limited to 'core/src/fxge')
-rw-r--r--core/src/fxge/ge/fx_ge_fontmap.cpp2
-rw-r--r--core/src/fxge/win32/fx_win32_device.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp
index 817ce2786a..2dfb3c7a17 100644
--- a/core/src/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/src/fxge/ge/fx_ge_fontmap.cpp
@@ -463,7 +463,7 @@ void CFX_FontMapper::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
m_pFontInfo = pFontInfo;
}
static CFX_ByteString _TT_NormalizeName(const FX_CHAR* family) {
- CFX_ByteString norm(family, -1);
+ CFX_ByteString norm(family);
norm.Remove(' ');
norm.Remove('-');
norm.Remove(',');
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp
index a40e79bde7..93c2fd6836 100644
--- a/core/src/fxge/win32/fx_win32_device.cpp
+++ b/core/src/fxge/win32/fx_win32_device.cpp
@@ -122,7 +122,7 @@ FX_BOOL CFX_Win32FontInfo::IsSupportFontFormDiv(const LOGFONTA* plf) {
}
void CFX_Win32FontInfo::AddInstalledFont(const LOGFONTA* plf,
FX_DWORD FontType) {
- CFX_ByteString name(plf->lfFaceName, -1);
+ CFX_ByteString name(plf->lfFaceName);
if (name[0] == '@') {
return;
}