diff options
| author | thestig <thestig@chromium.org> | 2016-06-01 20:18:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-01 20:18:41 -0700 |
| commit | a31d4a90f3446df76d8d3ffa0b441db0ad4623af (patch) | |
| tree | b66f6dafdb562a4aa5ec7364028c00e888836f20 /core/fxge/apple | |
| parent | dbdcb81a82cd9e46023a3ee500df75717c1a47b4 (diff) | |
| download | pdfium-a31d4a90f3446df76d8d3ffa0b441db0ad4623af.tar.xz | |
Change CFX_Font::GetPsName() to return a CFX_ByteString.
So everyone can avoid doing Byte to WideString conversions.
Also remove CFX_GEFont::GetPsName() and deduplicate a couple of
GetPsName() calls.
Review-Url: https://codereview.chromium.org/2019173002
Diffstat (limited to 'core/fxge/apple')
| -rw-r--r-- | core/fxge/apple/fx_apple_platform.cpp | 4 | ||||
| -rw-r--r-- | core/fxge/apple/fx_quartz_device.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index a641ad5f85..7bedc678ac 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -71,9 +71,9 @@ static FX_BOOL _CGDrawGlyphRun(CGContextRef pContext, static_cast<CApplePlatform*>(CFX_GEModule::Get()->GetPlatformData()) ->m_quartz2d; if (!pFont->GetPlatformFont()) { - if (pFont->GetPsName() == CFX_WideString::FromLocal("DFHeiStd-W5")) { + if (pFont->GetPsName() == "DFHeiStd-W5") return FALSE; - } + pFont->SetPlatformFont( quartz2d.CreateFont(pFont->GetFontData(), pFont->GetSize())); if (!pFont->GetPlatformFont()) { diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 5bdffa9409..6fc22ffdf4 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -758,9 +758,9 @@ FX_BOOL CFX_QuartzDeviceDriver::CG_DrawGlypRun(int nChars, static_cast<CApplePlatform*>(CFX_GEModule::Get()->GetPlatformData()) ->m_quartz2d; if (!pFont->GetPlatformFont()) { - if (pFont->GetPsName() == CFX_WideString::FromLocal("DFHeiStd-W5")) { + if (pFont->GetPsName() == "DFHeiStd-W5") return FALSE; - } + pFont->SetPlatformFont( quartz2d.CreateFont(pFont->GetFontData(), pFont->GetSize())); if (!pFont->GetPlatformFont()) { |