diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 16:43:37 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 14:14:51 +0000 |
| commit | 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 (patch) | |
| tree | f0b0607f6b757eb22237527215094bd87b5d03ba /xfa/fde/css/cfde_cssselector.cpp | |
| parent | 893822aa5b6254591f8e80fbffcbb4fa6ad849aa (diff) | |
| download | pdfium-812e96c2b4c5908a1979da5e27cdcecda0d1dfc9.tar.xz | |
Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8
Reviewed-on: https://pdfium-review.googlesource.com/2967
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fde/css/cfde_cssselector.cpp')
| -rw-r--r-- | xfa/fde/css/cfde_cssselector.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fde/css/cfde_cssselector.cpp b/xfa/fde/css/cfde_cssselector.cpp index 03580236f5..6842d58738 100644 --- a/xfa/fde/css/cfde_cssselector.cpp +++ b/xfa/fde/css/cfde_cssselector.cpp @@ -12,14 +12,14 @@ namespace { -bool IsCSSChar(FX_WCHAR wch) { +bool IsCSSChar(wchar_t wch) { return (wch >= 'a' && wch <= 'z') || (wch >= 'A' && wch <= 'Z'); } -int32_t GetCSSNameLen(const FX_WCHAR* psz, const FX_WCHAR* pEnd) { - const FX_WCHAR* pStart = psz; +int32_t GetCSSNameLen(const wchar_t* psz, const wchar_t* pEnd) { + const wchar_t* pStart = psz; while (psz < pEnd) { - FX_WCHAR wch = *psz; + wchar_t wch = *psz; if (IsCSSChar(wch) || (wch >= '0' && wch <= '9') || wch == '_' || wch == '-') { ++psz; @@ -33,7 +33,7 @@ int32_t GetCSSNameLen(const FX_WCHAR* psz, const FX_WCHAR* pEnd) { } // namespace CFDE_CSSSelector::CFDE_CSSSelector(FDE_CSSSelectorType eType, - const FX_WCHAR* psz, + const wchar_t* psz, int32_t iLen, bool bIgnoreCase) : m_eType(eType), @@ -58,9 +58,9 @@ std::unique_ptr<CFDE_CSSSelector> CFDE_CSSSelector::FromString( const CFX_WideStringC& str) { ASSERT(!str.IsEmpty()); - const FX_WCHAR* psz = str.c_str(); - const FX_WCHAR* pStart = psz; - const FX_WCHAR* pEnd = psz + str.GetLength(); + const wchar_t* psz = str.c_str(); + const wchar_t* pStart = psz; + const wchar_t* pEnd = psz + str.GetLength(); for (; psz < pEnd; ++psz) { switch (*psz) { case '>': @@ -72,7 +72,7 @@ std::unique_ptr<CFDE_CSSSelector> CFDE_CSSSelector::FromString( std::unique_ptr<CFDE_CSSSelector> pFirst = nullptr; for (psz = pStart; psz < pEnd;) { - FX_WCHAR wch = *psz; + wchar_t wch = *psz; if (IsCSSChar(wch) || wch == '*') { int32_t iNameLen = wch == '*' ? 1 : GetCSSNameLen(psz, pEnd); auto p = pdfium::MakeUnique<CFDE_CSSSelector>( |