From 4d06f83da7fbc65e83ecc3c36b339c04ac1ab668 Mon Sep 17 00:00:00 2001 From: tsepez Date: Tue, 3 May 2016 14:13:29 -0700 Subject: 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 --- xfa/fde/css/fde_cssdatatable.cpp | 2 +- xfa/fde/css/fde_cssdatatable.h | 2 +- xfa/fde/css/fde_cssdeclaration.cpp | 47 ++++++++++++++++++------------------ xfa/fde/css/fde_cssdeclaration.h | 14 +++++------ xfa/fde/css/fde_cssstyleselector.cpp | 17 ++++++------- xfa/fde/css/fde_cssstyleselector.h | 12 ++++----- xfa/fde/css/fde_cssstylesheet.cpp | 14 +++++------ xfa/fde/css/fde_cssstylesheet.h | 8 +++--- 8 files changed, 57 insertions(+), 59 deletions(-) (limited to 'xfa/fde/css') diff --git a/xfa/fde/css/fde_cssdatatable.cpp b/xfa/fde/css/fde_cssdatatable.cpp index 853666f4ed..3b090a2699 100644 --- a/xfa/fde/css/fde_cssdatatable.cpp +++ b/xfa/fde/css/fde_cssdatatable.cpp @@ -779,7 +779,7 @@ FX_BOOL FDE_ParseCSSColor(const FX_WCHAR* pszValue, return FALSE; } -CFDE_CSSValueList::CFDE_CSSValueList(IFX_MEMAllocator* pStaticStore, +CFDE_CSSValueList::CFDE_CSSValueList(IFX_MemoryAllocator* pStaticStore, const CFDE_CSSValueArray& list) { m_iCount = list.GetSize(); int32_t iByteCount = m_iCount * sizeof(IFDE_CSSValue*); diff --git a/xfa/fde/css/fde_cssdatatable.h b/xfa/fde/css/fde_cssdatatable.h index dda04c4691..30e7eb0ee6 100644 --- a/xfa/fde/css/fde_cssdatatable.h +++ b/xfa/fde/css/fde_cssdatatable.h @@ -91,7 +91,7 @@ typedef CFX_ArrayTemplate CFDE_CSSPrimitiveArray; typedef CFX_ArrayTemplate CFDE_CSSValueArray; class CFDE_CSSValueList : public IFDE_CSSValueList, public CFX_Target { public: - CFDE_CSSValueList(IFX_MEMAllocator* pStaticStore, + CFDE_CSSValueList(IFX_MemoryAllocator* pStaticStore, const CFDE_CSSValueArray& list); virtual int32_t CountValues() const { return m_iCount; } virtual IFDE_CSSValue* GetValue(int32_t index) const { diff --git a/xfa/fde/css/fde_cssdeclaration.cpp b/xfa/fde/css/fde_cssdeclaration.cpp index 80945245cf..f4f55fc0db 100644 --- a/xfa/fde/css/fde_cssdeclaration.cpp +++ b/xfa/fde/css/fde_cssdeclaration.cpp @@ -76,7 +76,7 @@ const FX_WCHAR* CFDE_CSSDeclaration::CopyToLocal( return psz; } IFDE_CSSPrimitiveValue* CFDE_CSSDeclaration::NewNumberValue( - IFX_MEMAllocator* pStaticStore, + IFX_MemoryAllocator* pStaticStore, FDE_CSSPRIMITIVETYPE eUnit, FX_FLOAT fValue) const { static CFDE_CSSPrimitiveValue s_ZeroValue(FDE_CSSPRIMITIVETYPE_Number, 0.0f); @@ -86,11 +86,11 @@ IFDE_CSSPrimitiveValue* CFDE_CSSDeclaration::NewNumberValue( return FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(eUnit, fValue); } inline IFDE_CSSPrimitiveValue* CFDE_CSSDeclaration::NewEnumValue( - IFX_MEMAllocator* pStaticStore, + IFX_MemoryAllocator* pStaticStore, FDE_CSSPROPERTYVALUE eValue) const { return FXTARGET_NewWith(pStaticStore) CFDE_CSSPrimitiveValue(eValue); } -void CFDE_CSSDeclaration::AddPropertyHolder(IFX_MEMAllocator* pStaticStore, +void CFDE_CSSDeclaration::AddPropertyHolder(IFX_MemoryAllocator* pStaticStore, FDE_CSSPROPERTY eProperty, IFDE_CSSValue* pValue, FX_BOOL bImportant) { @@ -168,7 +168,7 @@ FX_BOOL CFDE_CSSDeclaration::AddProperty(const FDE_CSSPROPERTYARGS* pArgs, } } break; case FDE_CSSVALUETYPE_Shorthand: { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; IFDE_CSSValue *pColor, *pStyle, *pWidth; switch (pArgs->pProperty->eName) { case FDE_CSSPROPERTY_Font: @@ -415,7 +415,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseContentProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = (IFX_MEMAllocator*)pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); FDE_CSSPRIMITIVETYPE eType; CFDE_CSSValueArray list; @@ -479,7 +479,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseCounterProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); CFDE_CSSValueArray list; CFDE_CSSValueArray listFull; @@ -535,7 +535,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseValueListProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; FX_WCHAR separator = (pArgs->pProperty->eName == FDE_CSSPROPERTY_FontFamily) ? ',' : ' '; CFDE_CSSValueListParser parser(pszValue, iValueLen, separator); @@ -628,13 +628,14 @@ FX_BOOL CFDE_CSSDeclaration::ParseValueListProperty( } return FALSE; } -FX_BOOL CFDE_CSSDeclaration::Add4ValuesProperty(IFX_MEMAllocator* pStaticStore, - const CFDE_CSSValueArray& list, - FX_BOOL bImportant, - FDE_CSSPROPERTY eLeft, - FDE_CSSPROPERTY eTop, - FDE_CSSPROPERTY eRight, - FDE_CSSPROPERTY eBottom) { +FX_BOOL CFDE_CSSDeclaration::Add4ValuesProperty( + IFX_MemoryAllocator* pStaticStore, + const CFDE_CSSValueArray& list, + FX_BOOL bImportant, + FDE_CSSPROPERTY eLeft, + FDE_CSSPROPERTY eTop, + FDE_CSSPROPERTY eRight, + FDE_CSSPROPERTY eBottom) { switch (list.GetSize()) { case 1: AddPropertyHolder(pStaticStore, eLeft, list[0], bImportant); @@ -666,7 +667,7 @@ FX_BOOL CFDE_CSSDeclaration::Add4ValuesProperty(IFX_MEMAllocator* pStaticStore, return FALSE; } FX_BOOL CFDE_CSSDeclaration::ParseBorderPropoerty( - IFX_MEMAllocator* pStaticStore, + IFX_MemoryAllocator* pStaticStore, const FX_WCHAR* pszValue, int32_t iValueLen, IFDE_CSSValue*& pColor, @@ -756,7 +757,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBorderPropoerty( } return TRUE; } -void CFDE_CSSDeclaration::AddBorderProperty(IFX_MEMAllocator* pStaticStore, +void CFDE_CSSDeclaration::AddBorderProperty(IFX_MemoryAllocator* pStaticStore, IFDE_CSSValue* pColor, IFDE_CSSValue* pStyle, IFDE_CSSValue* pWidth, @@ -773,7 +774,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseListStyleProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue *pType = NULL, *pImage = NULL, *pPosition = NULL; FDE_CSSPRIMITIVETYPE eType; @@ -853,7 +854,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseBackgroundProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue *pColor = NULL, *pImage = NULL, *pRepeat = NULL; IFDE_CSSPrimitiveValue *pPosX = NULL, *pPosY = NULL, *pAttachment = NULL; @@ -992,7 +993,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseFontProperty(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, '/'); IFDE_CSSPrimitiveValue *pStyle = NULL, *pVariant = NULL, *pWeight = NULL; IFDE_CSSPrimitiveValue *pFontSize = NULL, *pLineHeight = NULL; @@ -1130,7 +1131,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnRuleProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue* pColumnRuleWidth = NULL; IFDE_CSSPrimitiveValue* pColumnRuleStyle = NULL; @@ -1228,7 +1229,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseTextEmphasisProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); CFDE_CSSValueArray arrEmphasisStyle; FDE_CSSPRIMITIVETYPE eType; @@ -1281,7 +1282,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseColumnsProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue* pColumnWidth = NULL; IFDE_CSSPrimitiveValue* pColumnCount = NULL; @@ -1334,7 +1335,7 @@ FX_BOOL CFDE_CSSDeclaration::ParseOverflowProperty( const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant) { - IFX_MEMAllocator* pStaticStore = pArgs->pStaticStore; + IFX_MemoryAllocator* pStaticStore = pArgs->pStaticStore; CFDE_CSSValueListParser parser(pszValue, iValueLen, ' '); IFDE_CSSPrimitiveValue* pOverflowX = NULL; IFDE_CSSPrimitiveValue* pOverflowY = NULL; diff --git a/xfa/fde/css/fde_cssdeclaration.h b/xfa/fde/css/fde_cssdeclaration.h index d9bacd0e4f..4fa6858f97 100644 --- a/xfa/fde/css/fde_cssdeclaration.h +++ b/xfa/fde/css/fde_cssdeclaration.h @@ -25,7 +25,7 @@ class FDE_CSSCustomProperty : public CFX_Target { }; struct FDE_CSSPROPERTYARGS { - IFX_MEMAllocator* pStaticStore; + IFX_MemoryAllocator* pStaticStore; CFX_MapPtrToPtr* pStringCache; FDE_LPCCSSPROPERTYTABLE pProperty; }; @@ -87,13 +87,13 @@ class CFDE_CSSDeclaration : public CFX_Target { const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL ParseBorderPropoerty(IFX_MEMAllocator* pStaticStore, + FX_BOOL ParseBorderPropoerty(IFX_MemoryAllocator* pStaticStore, const FX_WCHAR* pszValue, int32_t iValueLen, IFDE_CSSValue*& pColor, IFDE_CSSValue*& pStyle, IFDE_CSSValue*& pWidth) const; - void AddBorderProperty(IFX_MEMAllocator* pStaticStore, + void AddBorderProperty(IFX_MemoryAllocator* pStaticStore, IFDE_CSSValue* pColor, IFDE_CSSValue* pStyle, IFDE_CSSValue* pWidth, @@ -113,7 +113,7 @@ class CFDE_CSSDeclaration : public CFX_Target { const FX_WCHAR* pszValue, int32_t iValueLen, FX_BOOL bImportant); - FX_BOOL Add4ValuesProperty(IFX_MEMAllocator* pStaticStore, + FX_BOOL Add4ValuesProperty(IFX_MemoryAllocator* pStaticStore, const CFDE_CSSValueArray& list, FX_BOOL bImportant, FDE_CSSPROPERTY eLeft, @@ -141,14 +141,14 @@ class CFDE_CSSDeclaration : public CFX_Target { const FX_WCHAR* CopyToLocal(const FDE_CSSPROPERTYARGS* pArgs, const FX_WCHAR* pszValue, int32_t iValueLen); - void AddPropertyHolder(IFX_MEMAllocator* pStaticStore, + void AddPropertyHolder(IFX_MemoryAllocator* pStaticStore, FDE_CSSPROPERTY eProperty, IFDE_CSSValue* pValue, FX_BOOL bImportant); - IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MEMAllocator* pStaticStore, + IFDE_CSSPrimitiveValue* NewNumberValue(IFX_MemoryAllocator* pStaticStore, FDE_CSSPRIMITIVETYPE eUnit, FX_FLOAT fValue) const; - IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MEMAllocator* pStaticStore, + IFDE_CSSPrimitiveValue* NewEnumValue(IFX_MemoryAllocator* pStaticStore, FDE_CSSPROPERTYVALUE eValue) const; FDE_CSSPropertyHolder* m_pFirstProperty; diff --git a/xfa/fde/css/fde_cssstyleselector.cpp b/xfa/fde/css/fde_cssstyleselector.cpp index 55a1477b4c..01a19267e1 100644 --- a/xfa/fde/css/fde_cssstyleselector.cpp +++ b/xfa/fde/css/fde_cssstyleselector.cpp @@ -247,10 +247,9 @@ CFDE_CSSAccelerator* CFDE_CSSStyleSelector::InitAccelerator() { IFDE_CSSComputedStyle* CFDE_CSSStyleSelector::CreateComputedStyle( IFDE_CSSComputedStyle* pParentStyle) { - if (m_pFixedStyleStore == NULL) { - m_pFixedStyleStore = FX_CreateAllocator(FX_ALLOCTYPE_Fixed, 16, - sizeof(CFDE_CSSComputedStyle)); - ASSERT(m_pFixedStyleStore != NULL); + if (!m_pFixedStyleStore) { + m_pFixedStyleStore = IFX_MemoryAllocator::Create( + FX_ALLOCTYPE_Fixed, 16, sizeof(CFDE_CSSComputedStyle)); } CFDE_CSSComputedStyle* pStyle = FXTARGET_NewWith(m_pFixedStyleStore) CFDE_CSSComputedStyle(m_pFixedStyleStore); @@ -292,8 +291,7 @@ void CFDE_CSSStyleSelector::SetStylePriority( } void CFDE_CSSStyleSelector::UpdateStyleIndex(uint32_t dwMediaList) { Reset(); - m_pRuleDataStore = FX_CreateAllocator(FX_ALLOCTYPE_Static, 1024, 0); - ASSERT(m_pRuleDataStore != NULL); + m_pRuleDataStore = IFX_MemoryAllocator::Create(FX_ALLOCTYPE_Static, 1024, 0); for (int32_t iGroup = 0; iGroup < FDE_CSSSTYLESHEETGROUP_MAX; ++iGroup) { CFDE_CSSRuleCollection& rules = m_RuleCollection[iGroup]; rules.m_pStaticStore = m_pRuleDataStore; @@ -425,9 +423,10 @@ void CFDE_CSSStyleSelector::ComputeStyle( static const uint32_t s_dwAlignHash = FX_HashCode_GetW(L"align", true); if (!pTag->empty()) { - if (!m_pInlineStyleStore) - m_pInlineStyleStore = FX_CreateAllocator(FX_ALLOCTYPE_Static, 2048, 0); - + if (!m_pInlineStyleStore) { + m_pInlineStyleStore = + IFX_MemoryAllocator::Create(FX_ALLOCTYPE_Static, 2048, 0); + } CFDE_CSSDeclaration* pDecl = nullptr; for (auto it : *pTag) { CFX_WideString wsAttri = it.first; diff --git a/xfa/fde/css/fde_cssstyleselector.h b/xfa/fde/css/fde_cssstyleselector.h index 6c23a9eb1d..790149c596 100644 --- a/xfa/fde/css/fde_cssstyleselector.h +++ b/xfa/fde/css/fde_cssstyleselector.h @@ -68,7 +68,7 @@ class CFDE_CSSRuleCollection : public CFX_Target { FDE_CSSRuleData* GetUniversalRuleData() { return m_pUniversalRules; } FDE_CSSRuleData* GetPersudoRuleData() { return m_pPersudoRules; } - IFX_MEMAllocator* m_pStaticStore; + IFX_MemoryAllocator* m_pStaticStore; protected: void AddRulesFrom(IFDE_CSSStyleSheet* pStyleSheet, @@ -182,12 +182,12 @@ class CFDE_CSSStyleSelector : public CFX_Target { IFX_FontMgr* m_pFontMgr; FX_FLOAT m_fDefFontSize; - IFX_MEMAllocator* m_pRuleDataStore; + IFX_MemoryAllocator* m_pRuleDataStore; CFDE_CSSStyleSheetArray m_SheetGroups[FDE_CSSSTYLESHEETGROUP_MAX]; CFDE_CSSRuleCollection m_RuleCollection[FDE_CSSSTYLESHEETGROUP_MAX]; FDE_CSSSTYLESHEETGROUP m_ePriorities[FDE_CSSSTYLESHEETPRIORITY_MAX]; - IFX_MEMAllocator* m_pInlineStyleStore; - IFX_MEMAllocator* m_pFixedStyleStore; + IFX_MemoryAllocator* m_pInlineStyleStore; + IFX_MemoryAllocator* m_pFixedStyleStore; CFDE_CSSAccelerator* m_pAccelerator; std::vector m_MatchedRules; }; @@ -387,7 +387,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, public IFDE_CSSParagraphStyle, public CFX_Target { public: - CFDE_CSSComputedStyle(IFX_MEMAllocator* pAlloc) + CFDE_CSSComputedStyle(IFX_MemoryAllocator* pAlloc) : m_dwRefCount(1), m_pAllocator(pAlloc) {} ~CFDE_CSSComputedStyle() {} @@ -580,7 +580,7 @@ class CFDE_CSSComputedStyle : public IFDE_CSSComputedStyle, } uint32_t m_dwRefCount; - IFX_MEMAllocator* m_pAllocator; + IFX_MemoryAllocator* m_pAllocator; CFDE_CSSInheritedData m_InheritedData; CFDE_CSSNonInheritedData m_NonInheritedData; CFX_WideStringArray m_CustomProperties; diff --git a/xfa/fde/css/fde_cssstylesheet.cpp b/xfa/fde/css/fde_cssstylesheet.cpp index 7a661af1c0..db01274d6a 100644 --- a/xfa/fde/css/fde_cssstylesheet.cpp +++ b/xfa/fde/css/fde_cssstylesheet.cpp @@ -150,10 +150,7 @@ FX_BOOL CFDE_CSSStyleSheet::LoadFromBuffer(const CFX_WideString& szUrl, } FX_BOOL CFDE_CSSStyleSheet::LoadFromSyntax(CFDE_CSSSyntaxParser* pSyntax) { Reset(); - m_pAllocator = FX_CreateAllocator(FX_ALLOCTYPE_Static, 1024, 0); - if (m_pAllocator == NULL) { - return FALSE; - } + m_pAllocator = IFX_MemoryAllocator::Create(FX_ALLOCTYPE_Static, 1024, 0); FDE_CSSSYNTAXSTATUS eStatus; do { switch (eStatus = pSyntax->DoSyntaxParse()) { @@ -357,7 +354,7 @@ FDE_CSSSYNTAXSTATUS CFDE_CSSStyleSheet::SkipRuleSet( } return FDE_CSSSYNTAXSTATUS_None; } -void CFDE_CSSStyleRule::SetSelector(IFX_MEMAllocator* pStaticStore, +void CFDE_CSSStyleRule::SetSelector(IFX_MemoryAllocator* pStaticStore, const CFDE_CSSSelectorArray& list) { ASSERT(m_ppSelector == NULL); m_iSelectors = list.GetSize(); @@ -409,9 +406,10 @@ int32_t FDE_GetCSSNameLen(const FX_WCHAR* psz, const FX_WCHAR* pEnd) { } return psz - pStart; } -CFDE_CSSSelector* CFDE_CSSSelector::FromString(IFX_MEMAllocator* pStaticStore, - const FX_WCHAR* psz, - int32_t iLen) { +CFDE_CSSSelector* CFDE_CSSSelector::FromString( + IFX_MemoryAllocator* pStaticStore, + const FX_WCHAR* psz, + int32_t iLen) { ASSERT(pStaticStore != NULL && psz != NULL && iLen > 0); const FX_WCHAR* pStart = psz; const FX_WCHAR* pEnd = psz + iLen; 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; -- cgit v1.2.3