From e0347a6408dc21b4fcf7a713de69aacb785c7230 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 11 Aug 2016 11:24:11 -0700 Subject: Remove fgas_system files. The two methods in fgas_system also exist in core/fxcrt/include/fx_ext with the FXSYS_ prefix instead of FX_. Remove the fgas_system files and use the fx_ext versions instead. Review-Url: https://codereview.chromium.org/2233133002 --- xfa/fde/css/fde_cssdatatable.cpp | 11 +++++------ xfa/fde/css/fde_cssdeclaration.cpp | 3 +-- xfa/fde/css/fde_cssstyleselector.h | 1 - 3 files changed, 6 insertions(+), 9 deletions(-) (limited to 'xfa/fde/css') diff --git a/xfa/fde/css/fde_cssdatatable.cpp b/xfa/fde/css/fde_cssdatatable.cpp index 9bccd32602..0d253ba594 100644 --- a/xfa/fde/css/fde_cssdatatable.cpp +++ b/xfa/fde/css/fde_cssdatatable.cpp @@ -8,7 +8,6 @@ #include "core/fxcrt/include/fx_ext.h" #include "xfa/fgas/crt/fgas_codepage.h" -#include "xfa/fgas/crt/fgas_system.h" namespace { @@ -679,7 +678,7 @@ FX_BOOL FDE_ParseCSSNumber(const FX_WCHAR* pszValue, FDE_CSSPRIMITIVETYPE& eUnit) { ASSERT(pszValue && iValueLen > 0); int32_t iUsedLen = 0; - fValue = FX_wcstof(pszValue, iValueLen, &iUsedLen); + fValue = FXSYS_wcstof(pszValue, iValueLen, &iUsedLen); if (iUsedLen <= 0) return FALSE; @@ -719,7 +718,7 @@ FX_BOOL FDE_ParseCSSURI(const FX_WCHAR* pszValue, int32_t& iLength) { ASSERT(pszValue && iValueLen > 0); if (iValueLen < 6 || pszValue[iValueLen - 1] != ')' || - FX_wcsnicmp(L"url(", pszValue, 4)) { + FXSYS_wcsnicmp(L"url(", pszValue, 4)) { return FALSE; } if (FDE_ParseCSSString(pszValue + 4, iValueLen - 5, iOffset, iLength)) { @@ -756,7 +755,7 @@ FX_BOOL FDE_ParseCSSColor(const FX_WCHAR* pszValue, } if (iValueLen >= 10) { - if (pszValue[iValueLen - 1] != ')' || FX_wcsnicmp(L"rgb(", pszValue, 4)) + if (pszValue[iValueLen - 1] != ')' || FXSYS_wcsnicmp(L"rgb(", pszValue, 4)) return FALSE; uint8_t rgb[3] = {0}; @@ -836,7 +835,7 @@ FX_BOOL CFDE_CSSValueListParser::NextValue(FDE_CSSPRIMITIVETYPE& eType, m_pCur++; eType = FDE_CSSPRIMITIVETYPE_String; } else if (m_pEnd - m_pCur > 5 && m_pCur[3] == '(') { - if (FX_wcsnicmp(L"url", m_pCur, 3) == 0) { + if (FXSYS_wcsnicmp(L"url", m_pCur, 3) == 0) { wch = m_pCur[4]; if (wch == '\"' || wch == '\'') { pStart += 5; @@ -848,7 +847,7 @@ FX_BOOL CFDE_CSSValueListParser::NextValue(FDE_CSSPRIMITIVETYPE& eType, m_pCur++; } eType = FDE_CSSPRIMITIVETYPE_URI; - } else if (FX_wcsnicmp(L"rgb", m_pCur, 3) == 0) { + } else if (FXSYS_wcsnicmp(L"rgb", m_pCur, 3) == 0) { iLength = SkipTo(')') + 1; m_pCur++; eType = FDE_CSSPRIMITIVETYPE_RGB; diff --git a/xfa/fde/css/fde_cssdeclaration.cpp b/xfa/fde/css/fde_cssdeclaration.cpp index da1f42fabd..34a91ec83c 100644 --- a/xfa/fde/css/fde_cssdeclaration.cpp +++ b/xfa/fde/css/fde_cssdeclaration.cpp @@ -7,7 +7,6 @@ #include "xfa/fde/css/fde_cssdeclaration.h" #include "core/fxcrt/include/fx_ext.h" -#include "xfa/fgas/crt/fgas_system.h" IFDE_CSSValue* CFDE_CSSDeclaration::GetProperty(FDE_CSSPROPERTY eProperty, FX_BOOL& bImportant) const { @@ -106,7 +105,7 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(const FDE_CSSPROPERTYARGS* pArgs, ASSERT(iValueLen > 0); FX_BOOL bImportant = FALSE; if (iValueLen >= 10 && pszValue[iValueLen - 10] == '!' && - FX_wcsnicmp(L"important", pszValue + iValueLen - 9, 9) == 0) { + FXSYS_wcsnicmp(L"important", pszValue + iValueLen - 9, 9) == 0) { if ((iValueLen -= 10) == 0) { return FALSE; } diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h index 469712fb5d..6a3f2bf594 100644 --- a/xfa/fde/css/fde_cssstyleselector.h +++ b/xfa/fde/css/fde_cssstyleselector.h @@ -15,7 +15,6 @@ #include "xfa/fde/css/fde_csscache.h" #include "xfa/fde/css/fde_cssdeclaration.h" #include "xfa/fgas/crt/fgas_memory.h" -#include "xfa/fgas/crt/fgas_system.h" class CFDE_CSSAccelerator; class CFDE_CSSComputedStyle; -- cgit v1.2.3