From 283a0433b081f88275b2f7e8c04d3c41b9187ca6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 20 Apr 2017 14:11:21 -0400 Subject: Convert IFX_MemoryStream to CFX_MemoryStream The CFX_MemoryStream is the only implementation of IFX_MemoryStream. This CL removes the interfaces and uses CFX_MemoryStream directly. Change-Id: I2f43fa39e82dafa7673517d214ae15fd2d0df331 Reviewed-on: https://pdfium-review.googlesource.com/4391 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_dataexporter.cpp | 4 ++-- xfa/fxfa/parser/cxfa_node.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser') diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index 0c702fe53c..70748f2666 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -8,6 +8,7 @@ #include +#include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/xml/cfx_xmldoc.h" @@ -224,8 +225,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode, if (!pRichTextXML) break; - CFX_RetainPtr pMemStream = - IFX_MemoryStream::Create(true); + auto pMemStream = pdfium::MakeRetain(true); auto pTempStream = pdfium::MakeRetain(pMemStream, true); diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index a3c9ee42e0..d6d2ece428 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -13,6 +13,7 @@ #include #include "core/fxcrt/cfx_decimal.h" +#include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/xml/cfx_xmlelement.h" @@ -1406,8 +1407,7 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) { } XFA_DataExporter_DealWithDataGroupNode(this); } - CFX_RetainPtr pMemoryStream = - IFX_MemoryStream::Create(true); + auto pMemoryStream = pdfium::MakeRetain(true); auto pStream = pdfium::MakeRetain(pMemoryStream, true); pStream->SetCodePage(FX_CODEPAGE_UTF8); -- cgit v1.2.3