diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-22 12:30:58 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-22 12:30:58 -0800 |
| commit | a846215ad29b75670d9db4cb9225de9f1e6979b8 (patch) | |
| tree | 19044f71e7ddf3b10a0fe31df0340f68bff515b5 /xfa/src/fxfa | |
| parent | d6b15fc92cb30cfc346fe28379d0aa8a24cbf601 (diff) | |
| download | pdfium-a846215ad29b75670d9db4cb9225de9f1e6979b8.tar.xz | |
Remove unused stuff from fx_sys.h
Move FX_DOUBLE to fx_system.h to keep it with the others
until we remove it.
Having one memset/cpy wrapper is dubious, two are worse.
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1724523002 .
Diffstat (limited to 'xfa/src/fxfa')
| -rw-r--r-- | xfa/src/fxfa/src/app/xfa_textlayout.cpp | 4 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_object_imp.cpp | 4 | ||||
| -rw-r--r-- | xfa/src/fxfa/src/parser/xfa_script_imp.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp index 637e7b848a..b6eb986f4c 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp +++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp @@ -52,8 +52,8 @@ void CXFA_TextParseContext::SetDecls(const IFDE_CSSDeclaration** ppDeclArray, } m_dwMatchedDecls = iDeclCount; m_ppMatchedDecls = FX_Alloc(IFDE_CSSDeclaration*, iDeclCount); - FX_memcpy(m_ppMatchedDecls, ppDeclArray, - iDeclCount * sizeof(IFDE_CSSDeclaration*)); + FXSYS_memcpy(m_ppMatchedDecls, ppDeclArray, + iDeclCount * sizeof(IFDE_CSSDeclaration*)); } CXFA_TextParser::~CXFA_TextParser() { if (m_pUASheet != NULL) { diff --git a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp index fd6b23d1ec..4b6fc0ccbe 100644 --- a/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/src/fxfa/src/fm2js/xfa_fm2jscontext.cpp @@ -7172,7 +7172,7 @@ static FXJSE_FUNCTION formcalc_fm2js_functions[] = { }; CXFA_FM2JSContext::CXFA_FM2JSContext() : m_hFMClass(nullptr), m_pDocument(nullptr) { - FX_memset(&m_fmClass, 0, sizeof(FXJSE_CLASS)); + FXSYS_memset(&m_fmClass, 0, sizeof(FXJSE_CLASS)); } CXFA_FM2JSContext::~CXFA_FM2JSContext() { m_pDocument = NULL; diff --git a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp index 02e214de18..8c820fcb99 100644 --- a/xfa/src/fxfa/src/parser/xfa_object_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_object_imp.cpp @@ -3931,13 +3931,13 @@ FX_BOOL CXFA_Node::TryMeasure(XFA_ATTRIBUTE eAttr, void* pValue; int32_t iBytes; if (GetMapModuleBuffer(pKey, pValue, iBytes) && iBytes == sizeof(mValue)) { - FX_memcpy(&mValue, pValue, sizeof(mValue)); + FXSYS_memcpy(&mValue, pValue, sizeof(mValue)); return TRUE; } if (bUseDefault && XFA_GetAttributeDefaultValue(pValue, GetClassID(), eAttr, XFA_ATTRIBUTETYPE_Measure, m_ePacket)) { - FX_memcpy(&mValue, pValue, sizeof(mValue)); + FXSYS_memcpy(&mValue, pValue, sizeof(mValue)); return TRUE; } return FALSE; diff --git a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp index f5c1673460..6897acf785 100644 --- a/xfa/src/fxfa/src/parser/xfa_script_imp.cpp +++ b/xfa/src/fxfa/src/parser/xfa_script_imp.cpp @@ -29,8 +29,8 @@ CXFA_ScriptContext::CXFA_ScriptContext(CXFA_Document* pDocument) m_pThisObject(nullptr), m_dwBuiltInInFlags(0), m_eRunAtType(XFA_ATTRIBUTEENUM_Client) { - FX_memset(&m_JsGlobalClass, 0, sizeof(FXJSE_CLASS)); - FX_memset(&m_JsNormalClass, 0, sizeof(FXJSE_CLASS)); + FXSYS_memset(&m_JsGlobalClass, 0, sizeof(FXJSE_CLASS)); + FXSYS_memset(&m_JsNormalClass, 0, sizeof(FXJSE_CLASS)); } CXFA_ScriptContext::~CXFA_ScriptContext() { FX_POSITION ps = m_mapXFAToHValue.GetStartPosition(); |