summaryrefslogtreecommitdiff
path: root/core/fxge
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2018-03-09 17:46:50 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-03-09 17:46:50 +0000
commit69da36c5f841e8c6e5ded6c704d9ef58c57d532a (patch)
tree42f50adb5d062f3971f8c6a4f899e737f5462c6c /core/fxge
parent3baef5c6daf58cec2df193714b5727802d0bd42e (diff)
downloadpdfium-69da36c5f841e8c6e5ded6c704d9ef58c57d532a.tar.xz
Explicitly mark helper methods that only operate on ASCII ranges
A number of our character helper methods take in wide character types, but only do tests/operations on the ASCII range of characters. As a very quick first pass I am renaming all of the foot-gun methods to explictly call out this behaviour, while I do a bigger cleanup/refactor. BUG=pdfium:1035 Change-Id: Ia035dfa1cb6812fa6d45155c4565475032c4c165 Reviewed-on: https://pdfium-review.googlesource.com/28330 Commit-Queue: Ryan Harrison <rharrison@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge')
-rw-r--r--core/fxge/android/cfpf_skiafontmgr.cpp4
-rw-r--r--core/fxge/dib/fx_dib_main.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp
index d8b751d9b2..7413a69884 100644
--- a/core/fxge/android/cfpf_skiafontmgr.cpp
+++ b/core/fxge/android/cfpf_skiafontmgr.cpp
@@ -97,7 +97,7 @@ uint32_t FPF_GetHashCode_StringA(const char* pStr, int32_t iLength) {
const char* pStrEnd = pStr + iLength;
uint32_t uHashCode = 0;
while (pStr < pStrEnd)
- uHashCode = 31 * uHashCode + FXSYS_tolower(*pStr++);
+ uHashCode = 31 * uHashCode + FXSYS_toASCIIlower(*pStr++);
return uHashCode;
}
@@ -167,7 +167,7 @@ uint32_t FPF_SKIANormalizeFontName(const ByteStringView& bsfamily) {
char ch = pBuffer[i];
if (ch == ' ' || ch == '-' || ch == ',')
continue;
- dwHash = 31 * dwHash + FXSYS_tolower(ch);
+ dwHash = 31 * dwHash + FXSYS_toASCIIlower(ch);
}
return dwHash;
}
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 68e06a6c5d..f0767f3fc7 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -97,7 +97,7 @@ FX_ARGB StringToFXARGB(const WideStringView& wsValue) {
int cc = 0;
const wchar_t* str = wsValue.unterminated_c_str();
int len = wsValue.GetLength();
- while (FXSYS_iswspace(str[cc]) && cc < len)
+ while (FXSYS_iswASCIIspace(str[cc]) && cc < len)
cc++;
if (cc >= len)
@@ -112,7 +112,7 @@ FX_ARGB StringToFXARGB(const WideStringView& wsValue) {
}
if (cc < len && str[cc] == ',') {
cc++;
- while (FXSYS_iswspace(str[cc]) && cc < len)
+ while (FXSYS_iswASCIIspace(str[cc]) && cc < len)
cc++;
while (cc < len) {
@@ -124,7 +124,7 @@ FX_ARGB StringToFXARGB(const WideStringView& wsValue) {
}
if (cc < len && str[cc] == ',') {
cc++;
- while (FXSYS_iswspace(str[cc]) && cc < len)
+ while (FXSYS_iswASCIIspace(str[cc]) && cc < len)
cc++;
while (cc < len) {