diff options
| author | tsepez <tsepez@chromium.org> | 2016-11-30 15:10:55 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-30 15:10:55 -0800 |
| commit | 345d489b70a8e057587512524e69bd5692e2e14b (patch) | |
| tree | 01a34c53a991ef069b503bed1b8d1845510cfe04 /xfa/fxfa | |
| parent | 47718fbaf24000877aff58d9512b9b1dea0af818 (diff) | |
| download | pdfium-345d489b70a8e057587512524e69bd5692e2e14b.tar.xz | |
Convert loose FX_Create* functions into static methods
Also remove a bool that is always false.
Review-Url: https://codereview.chromium.org/2539203002
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffdoc.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidget.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_dataexporter.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_node.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index 1b5665bb08..cf5b289613 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -417,8 +417,8 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName, CPDF_StreamAcc streamAcc; streamAcc.LoadAllData(pStream); - IFX_SeekableReadStream* pImageFileRead = - FX_CreateMemoryStream((uint8_t*)streamAcc.GetData(), streamAcc.GetSize()); + IFX_SeekableReadStream* pImageFileRead = IFX_MemoryStream::Create( + (uint8_t*)streamAcc.GetData(), streamAcc.GetSize()); CFX_DIBitmap* pDibSource = XFA_LoadImageFromBuffer( pImageFileRead, FXCODEC_IMAGE_UNKNOWN, iImageXDpi, iImageYDpi); diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index e6c0c595b2..bc1854eb42 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -1066,11 +1066,11 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc, pImageBuffer = FX_Alloc(uint8_t, iLength); int32_t iRead = XFA_Base64Decode(bsData.c_str(), pImageBuffer); if (iRead > 0) { - pImageFileRead = FX_CreateMemoryStream(pImageBuffer, iRead); + pImageFileRead = IFX_MemoryStream::Create(pImageBuffer, iRead); } } else { bsContent = CFX_ByteString::FromUnicode(wsImage); - pImageFileRead = FX_CreateMemoryStream( + pImageFileRead = IFX_MemoryStream::Create( const_cast<uint8_t*>(bsContent.raw_str()), bsContent.GetLength()); } } else { diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index ad9693f98f..1ec9c44de6 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -197,7 +197,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode, if (!pRichTextXML) break; - IFX_MemoryStream* pMemStream = FX_CreateMemoryStream(true); + IFX_MemoryStream* pMemStream = IFX_MemoryStream::Create(true); IFX_Stream* pTempStream = IFX_Stream::CreateStream( (IFX_SeekableWriteStream*)pMemStream, FX_STREAMACCESS_Text | FX_STREAMACCESS_Write | diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 18ea41419a..05ddcfc71b 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1442,7 +1442,7 @@ void CXFA_Node::Script_NodeClass_SaveXML(CFXJSE_Arguments* pArguments) { XFA_DataExporter_DealWithDataGroupNode(this); } std::unique_ptr<IFX_MemoryStream, ReleaseDeleter<IFX_MemoryStream>> - pMemoryStream(FX_CreateMemoryStream(true)); + pMemoryStream(IFX_MemoryStream::Create(true)); std::unique_ptr<IFX_Stream, ReleaseDeleter<IFX_Stream>> pStream( IFX_Stream::CreateStream( static_cast<IFX_SeekableWriteStream*>(pMemoryStream.get()), |