From 735eda96cf24349d10b160c8f5bd363b73d8aba1 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 12 Mar 2018 15:44:36 +0000 Subject: Remove all usages of FXSYS_iswASCIIalpha Instances are either replaced with FXSYS_iswalpha, which calls out to the ICU library to do the proper Unicode operations, or have been converted to a isascii && isalpha pair, if ASCII alpha is actually what was wanted. BUG=pdfium:1035 Change-Id: I971ff639ee1ff818ad08793a1900a8bcbb0a3e04 Reviewed-on: https://pdfium-review.googlesource.com/28450 Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- core/fxcrt/css/cfx_cssselector.cpp | 2 +- core/fxcrt/css/cfx_csssyntaxparser.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'core/fxcrt/css') diff --git a/core/fxcrt/css/cfx_cssselector.cpp b/core/fxcrt/css/cfx_cssselector.cpp index 8a22b12287..510114f2e5 100644 --- a/core/fxcrt/css/cfx_cssselector.cpp +++ b/core/fxcrt/css/cfx_cssselector.cpp @@ -67,7 +67,7 @@ std::unique_ptr CFX_CSSSelector::FromString( std::unique_ptr pFirst = nullptr; for (psz = pStart; psz < pEnd;) { wchar_t wch = *psz; - if (FXSYS_iswASCIIalpha(wch) || wch == '*') { + if ((isascii(wch) && isalpha(wch)) || wch == '*') { int32_t iNameLen = wch == '*' ? 1 : GetCSSNameLen(psz, pEnd); auto p = pdfium::MakeUnique(CFX_CSSSelectorType::Element, psz, iNameLen, true); diff --git a/core/fxcrt/css/cfx_csssyntaxparser.cpp b/core/fxcrt/css/cfx_csssyntaxparser.cpp index fea951f1ec..97586dc59f 100644 --- a/core/fxcrt/css/cfx_csssyntaxparser.cpp +++ b/core/fxcrt/css/cfx_csssyntaxparser.cpp @@ -18,7 +18,8 @@ namespace { bool IsSelectorStart(wchar_t wch) { - return wch == '.' || wch == '#' || wch == '*' || FXSYS_iswASCIIalpha(wch); + return wch == '.' || wch == '#' || wch == '*' || + (isascii(wch) && isalpha(wch)); } } // namespace -- cgit v1.2.3