diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-03 14:13:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-03 14:13:29 -0700 |
| commit | 4d06f83da7fbc65e83ecc3c36b339c04ac1ab668 (patch) | |
| tree | 183592694f9c93951838111130d78d204e1e9a68 /xfa/fde/css/fde_cssstylesheet.h | |
| parent | 89fcde88f0c03da77d7fd83dece7726d66fd190e (diff) | |
| download | pdfium-4d06f83da7fbc65e83ecc3c36b339c04ac1ab668.tar.xz | |
Cleanup XFA-Specific memory allocators.
Remove unused "dynamic" allocator (the scary one).
Use malloc/free wrapper allocator under #ifdef for CF/asan testing.
Rename IFX_MEMAllocator to IFX_MemoryAllocator (MEM in all caps
would imply that MEM was an acroynm, not an abbreviation).
Review-Url: https://codereview.chromium.org/1944093002
Diffstat (limited to 'xfa/fde/css/fde_cssstylesheet.h')
| -rw-r--r-- | xfa/fde/css/fde_cssstylesheet.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fde/css/fde_cssstylesheet.h b/xfa/fde/css/fde_cssstylesheet.h index 2a337d0a24..a78ae487bb 100644 --- a/xfa/fde/css/fde_cssstylesheet.h +++ b/xfa/fde/css/fde_cssstylesheet.h @@ -26,13 +26,13 @@ class CFDE_CSSSelector : public CFX_Target { virtual uint32_t GetNameHash() const { return m_dwHash; } virtual CFDE_CSSSelector* GetNextSelector() const { return m_pNext; } - static CFDE_CSSSelector* FromString(IFX_MEMAllocator* pStaticStore, + static CFDE_CSSSelector* FromString(IFX_MemoryAllocator* pStaticStore, const FX_WCHAR* psz, int32_t iLen); void SetNext(CFDE_CSSSelector* pNext) { m_pNext = pNext; } protected: - static CFDE_CSSSelector* ParseSelector(IFX_MEMAllocator* pStaticStore, + static CFDE_CSSSelector* ParseSelector(IFX_MemoryAllocator* pStaticStore, const FX_WCHAR* psz, int32_t& iOff, int32_t iLen, @@ -54,7 +54,7 @@ class CFDE_CSSStyleRule : public IFDE_CSSStyleRule, public CFX_Target { CFDE_CSSDeclaration* GetDeclaration() override { return &m_Declaration; } CFDE_CSSDeclaration& GetDeclImp() { return m_Declaration; } - void SetSelector(IFX_MEMAllocator* pStaticStore, + void SetSelector(IFX_MemoryAllocator* pStaticStore, const CFDE_CSSSelectorArray& list); protected: @@ -130,7 +130,7 @@ class CFDE_CSSStyleSheet : public IFDE_CSSStyleSheet, public CFX_Target { uint16_t m_wCodePage; uint16_t m_wRefCount; uint32_t m_dwMediaList; - IFX_MEMAllocator* m_pAllocator; + IFX_MemoryAllocator* m_pAllocator; CFDE_CSSRuleArray m_RuleArray; CFX_WideString m_szUrl; CFDE_CSSSelectorArray m_Selectors; |