Index: xfa/fxfa/app/xfa_textlayout.cpp |
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp |
index 9ed84e16040da3ba9d1f382ba134a673f06b4bc6..bd06421870b3396ddc4f1000e9f90ce537e3cb73 100644 |
--- a/xfa/fxfa/app/xfa_textlayout.cpp |
+++ b/xfa/fxfa/app/xfa_textlayout.cpp |
@@ -212,8 +212,8 @@ void CXFA_TextParser::DoParse(CFDE_XMLNode* pXMLContainer, |
if (pXMLContainer == NULL || pTextProvider == NULL || m_pAllocator) { |
return; |
} |
- m_pAllocator = |
- FX_CreateAllocator(FX_ALLOCTYPE_Fixed, 32, sizeof(CXFA_CSSTagProvider)); |
+ m_pAllocator = IFX_MemoryAllocator::Create(FX_ALLOCTYPE_Fixed, 32, |
+ sizeof(CXFA_CSSTagProvider)); |
InitCSSData(pTextProvider); |
IFDE_CSSComputedStyle* pRootStyle = CreateRootStyle(pTextProvider); |
ParseRichText(pXMLContainer, pRootStyle); |
@@ -1272,9 +1272,9 @@ void CXFA_TextLayout::UpdateAlign(FX_FLOAT fHeight, FX_FLOAT fBottom) { |
FX_BOOL CXFA_TextLayout::Loader(const CFX_SizeF& szText, |
FX_FLOAT& fLinePos, |
FX_BOOL bSavePieces) { |
- if (m_pAllocator == NULL) { |
- m_pAllocator = FX_CreateAllocator(FX_ALLOCTYPE_Static, 256, 0); |
- } |
+ if (!m_pAllocator) |
+ m_pAllocator = IFX_MemoryAllocator::Create(FX_ALLOCTYPE_Static, 256, 0); |
+ |
GetTextDataNode(); |
if (m_pTextDataNode == NULL) { |
return TRUE; |