summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-06 16:48:26 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-06 16:48:26 -0700
commit46bf0331229a7b7fe73cbe111550f5dd467b184a (patch)
tree4b99e9337e0c58c96bbf325e960401e23dff34ce /core/fxge
parent6334af71040b6148e9001aad4bd134a6c6c14a8d (diff)
downloadpdfium-46bf0331229a7b7fe73cbe111550f5dd467b184a.tar.xz
Make wide strings use StringData template
Shuffled the order of methods in fx_basic_wstring.cpp to match those in fx_basic_bstring.cpp. The way to review this patch is to diff those two files against each other. They are beginning to converge. Re-ordered some parameters in Concat() so that the string comes before its length. It feels wrong otherwise. Review URL: https://codereview.chromium.org/1846793002
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/ge/fx_ge_text.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 8d6fecf7a1..125547e5a7 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -192,7 +192,8 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars,
bool should_call_draw_device_text = true;
#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
if ((text_flags & FXFONT_CIDFONT) ||
- (pFont->GetPsName().Find(CFX_WideString::FromLocal("+ZJHL")) != -1) ||
+ (pFont->GetPsName().Find(
+ CFX_WideString::FromLocal("+ZJHL").AsWideStringC()) != -1) ||
(pFont->GetPsName() == CFX_WideString::FromLocal("CNAAJI+cmex10"))) {
should_call_draw_device_text = false;
}