diff options
Diffstat (limited to 'xfa/fxfa')
35 files changed, 135 insertions, 139 deletions
diff --git a/xfa/fxfa/cxfa_ffapp.h b/xfa/fxfa/cxfa_ffapp.h index 6ee9e45a13..857e9c03bb 100644 --- a/xfa/fxfa/cxfa_ffapp.h +++ b/xfa/fxfa/cxfa_ffapp.h @@ -12,8 +12,8 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/retain_ptr.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fwl/cfwl_app.h" #include "xfa/fxfa/fxfa.h" diff --git a/xfa/fxfa/cxfa_ffdoc.cpp b/xfa/fxfa/cxfa_ffdoc.cpp index 316987fcc3..ee31a46f50 100644 --- a/xfa/fxfa/cxfa_ffdoc.cpp +++ b/xfa/fxfa/cxfa_ffdoc.cpp @@ -334,7 +334,7 @@ void CXFA_FFDoc::CloseDoc() { m_pApp->ClearEventTargets(); } -CFX_RetainPtr<CFX_DIBitmap> CXFA_FFDoc::GetPDFNamedImage( +RetainPtr<CFX_DIBitmap> CXFA_FFDoc::GetPDFNamedImage( const WideStringView& wsName, int32_t& iImageXDpi, int32_t& iImageYDpi) { @@ -381,18 +381,18 @@ CFX_RetainPtr<CFX_DIBitmap> CXFA_FFDoc::GetPDFNamedImage( auto pAcc = pdfium::MakeRetain<CPDF_StreamAcc>(pStream); pAcc->LoadAllData(); - CFX_RetainPtr<IFX_SeekableStream> pImageFileRead = + RetainPtr<IFX_SeekableStream> pImageFileRead = pdfium::MakeRetain<CFX_MemoryStream>( const_cast<uint8_t*>(pAcc->GetData()), pAcc->GetSize(), false); - CFX_RetainPtr<CFX_DIBitmap> pDibSource = XFA_LoadImageFromBuffer( + RetainPtr<CFX_DIBitmap> pDibSource = XFA_LoadImageFromBuffer( pImageFileRead, FXCODEC_IMAGE_UNKNOWN, iImageXDpi, iImageYDpi); m_HashToDibDpiMap[dwHash] = {pDibSource, iImageXDpi, iImageYDpi}; return pDibSource; } bool CXFA_FFDoc::SavePackage(XFA_HashCode code, - const CFX_RetainPtr<IFX_SeekableStream>& pFile, + const RetainPtr<IFX_SeekableStream>& pFile, CFX_ChecksumContext* pCSContext) { CXFA_Document* doc = m_pDocumentParser->GetDocument(); auto pExport = pdfium::MakeUnique<CXFA_DataExporter>(doc); @@ -409,7 +409,7 @@ bool CXFA_FFDoc::SavePackage(XFA_HashCode code, pFile, pNode, 0, bsChecksum.GetLength() ? bsChecksum.c_str() : nullptr); } -bool CXFA_FFDoc::ImportData(const CFX_RetainPtr<IFX_SeekableStream>& pStream, +bool CXFA_FFDoc::ImportData(const RetainPtr<IFX_SeekableStream>& pStream, bool bXDP) { auto importer = pdfium::MakeUnique<CXFA_DataImporter>(m_pDocumentParser->GetDocument()); diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h index 1d35c669da..ceec91f7db 100644 --- a/xfa/fxfa/cxfa_ffdoc.h +++ b/xfa/fxfa/cxfa_ffdoc.h @@ -24,12 +24,12 @@ class CXFA_FFDocView; struct FX_IMAGEDIB_AND_DPI { FX_IMAGEDIB_AND_DPI(); FX_IMAGEDIB_AND_DPI(const FX_IMAGEDIB_AND_DPI& that); - FX_IMAGEDIB_AND_DPI(const CFX_RetainPtr<CFX_DIBSource>& pDib, + FX_IMAGEDIB_AND_DPI(const RetainPtr<CFX_DIBSource>& pDib, int32_t xDpi, int32_t yDpi); ~FX_IMAGEDIB_AND_DPI(); - CFX_RetainPtr<CFX_DIBSource> pDibSource; + RetainPtr<CFX_DIBSource> pDibSource; int32_t iImageXDpi; int32_t iImageYDpi; }; @@ -39,7 +39,7 @@ inline FX_IMAGEDIB_AND_DPI::FX_IMAGEDIB_AND_DPI( const FX_IMAGEDIB_AND_DPI& that) = default; inline FX_IMAGEDIB_AND_DPI::FX_IMAGEDIB_AND_DPI( - const CFX_RetainPtr<CFX_DIBSource>& pDib, + const RetainPtr<CFX_DIBSource>& pDib, int32_t xDpi, int32_t yDpi) : pDibSource(pDib), iImageXDpi(xDpi), iImageYDpi(yDpi) {} @@ -70,21 +70,21 @@ class CXFA_FFDoc { CPDF_Document* GetPDFDoc() const { return m_pPDFDoc.Get(); } CXFA_FFDocView* GetDocView(CXFA_LayoutProcessor* pLayout); CXFA_FFDocView* GetDocView(); - CFX_RetainPtr<CFX_DIBitmap> GetPDFNamedImage(const WideStringView& wsName, - int32_t& iImageXDpi, - int32_t& iImageYDpi); + RetainPtr<CFX_DIBitmap> GetPDFNamedImage(const WideStringView& wsName, + int32_t& iImageXDpi, + int32_t& iImageYDpi); CFGAS_PDFFontMgr* GetPDFFontMgr() const { return m_pPDFFontMgr.get(); } bool SavePackage(XFA_HashCode code, - const CFX_RetainPtr<IFX_SeekableStream>& pFile, + const RetainPtr<IFX_SeekableStream>& pFile, CFX_ChecksumContext* pCSContext); - bool ImportData(const CFX_RetainPtr<IFX_SeekableStream>& pStream, + bool ImportData(const RetainPtr<IFX_SeekableStream>& pStream, bool bXDP = true); private: CFX_UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment; std::unique_ptr<CXFA_DocumentParser> m_pDocumentParser; - CFX_RetainPtr<IFX_SeekableStream> m_pStream; + RetainPtr<IFX_SeekableStream> m_pStream; CFX_UnownedPtr<CXFA_FFApp> m_pApp; std::unique_ptr<CXFA_FFNotify> m_pNotify; CFX_UnownedPtr<CPDF_Document> m_pPDFDoc; diff --git a/xfa/fxfa/cxfa_ffimage.cpp b/xfa/fxfa/cxfa_ffimage.cpp index ec6a29cd28..757867f076 100644 --- a/xfa/fxfa/cxfa_ffimage.cpp +++ b/xfa/fxfa/cxfa_ffimage.cpp @@ -45,7 +45,7 @@ void CXFA_FFImage::RenderWidget(CXFA_Graphics* pGS, CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus); - CFX_RetainPtr<CFX_DIBitmap> pDIBitmap = GetDataAcc()->GetImageImage(); + RetainPtr<CFX_DIBitmap> pDIBitmap = GetDataAcc()->GetImageImage(); if (!pDIBitmap) return; diff --git a/xfa/fxfa/cxfa_ffimageedit.cpp b/xfa/fxfa/cxfa_ffimageedit.cpp index 1c9e014256..2189877afb 100644 --- a/xfa/fxfa/cxfa_ffimageedit.cpp +++ b/xfa/fxfa/cxfa_ffimageedit.cpp @@ -64,7 +64,7 @@ void CXFA_FFImageEdit::RenderWidget(CXFA_Graphics* pGS, CXFA_Border borderUI = m_pDataAcc->GetUIBorder(); DrawBorder(pGS, borderUI, m_rtUI, mtRotate); RenderCaption(pGS, &mtRotate); - CFX_RetainPtr<CFX_DIBitmap> pDIBitmap = m_pDataAcc->GetImageEditImage(); + RetainPtr<CFX_DIBitmap> pDIBitmap = m_pDataAcc->GetImageEditImage(); if (!pDIBitmap) return; diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 0935f56b90..7763a19972 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -1414,7 +1414,7 @@ class CXFA_ImageRenderer { ~CXFA_ImageRenderer(); bool Start(CFX_RenderDevice* pDevice, - const CFX_RetainPtr<CFX_DIBSource>& pDIBSource, + const RetainPtr<CFX_DIBSource>& pDIBSource, FX_ARGB bitmap_argb, int bitmap_alpha, const CFX_Matrix* pImage2Device, @@ -1424,7 +1424,7 @@ class CXFA_ImageRenderer { protected: bool StartDIBSource(); - void CompositeDIBitmap(const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap, + void CompositeDIBitmap(const RetainPtr<CFX_DIBitmap>& pDIBitmap, int left, int top, FX_ARGB mask_argb, @@ -1435,8 +1435,8 @@ class CXFA_ImageRenderer { CFX_RenderDevice* m_pDevice; int m_Status; CFX_Matrix m_ImageMatrix; - CFX_RetainPtr<CFX_DIBSource> m_pDIBSource; - CFX_RetainPtr<CFX_DIBitmap> m_pCloneConvert; + RetainPtr<CFX_DIBSource> m_pDIBSource; + RetainPtr<CFX_DIBitmap> m_pCloneConvert; int m_BitmapAlpha; FX_ARGB m_FillArgb; uint32_t m_Flags; @@ -1461,7 +1461,7 @@ CXFA_ImageRenderer::CXFA_ImageRenderer() CXFA_ImageRenderer::~CXFA_ImageRenderer() {} bool CXFA_ImageRenderer::Start(CFX_RenderDevice* pDevice, - const CFX_RetainPtr<CFX_DIBSource>& pDIBSource, + const RetainPtr<CFX_DIBSource>& pDIBSource, FX_ARGB bitmap_argb, int bitmap_alpha, const CFX_Matrix* pImage2Device, @@ -1497,7 +1497,7 @@ bool CXFA_ImageRenderer::StartDIBSource() { m_Result = false; return false; } - CFX_RetainPtr<CFX_DIBSource> pDib = m_pDIBSource; + RetainPtr<CFX_DIBSource> pDib = m_pDIBSource; if (m_pDIBSource->HasAlpha() && !(m_pDevice->GetRenderCaps() & FXRC_ALPHA_IMAGE) && !(m_pDevice->GetRenderCaps() & FXRC_GET_BITS)) { @@ -1549,7 +1549,7 @@ bool CXFA_ImageRenderer::StartDIBSource() { FX_RECT dest_clip( dest_rect.left - image_rect.left, dest_rect.top - image_rect.top, dest_rect.right - image_rect.left, dest_rect.bottom - image_rect.top); - CFX_RetainPtr<CFX_DIBitmap> pStretched = + RetainPtr<CFX_DIBitmap> pStretched = m_pDIBSource->StretchTo(dest_width, dest_height, m_Flags, &dest_clip); if (pStretched) { CompositeDIBitmap(pStretched, dest_rect.left, dest_rect.top, m_FillArgb, @@ -1563,7 +1563,7 @@ bool CXFA_ImageRenderer::Continue() { if (m_pTransformer->Continue(nullptr)) return true; - CFX_RetainPtr<CFX_DIBitmap> pBitmap = m_pTransformer->DetachBitmap(); + RetainPtr<CFX_DIBitmap> pBitmap = m_pTransformer->DetachBitmap(); if (!pBitmap) return false; @@ -1589,7 +1589,7 @@ bool CXFA_ImageRenderer::Continue() { } void CXFA_ImageRenderer::CompositeDIBitmap( - const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap, + const RetainPtr<CFX_DIBitmap>& pDIBitmap, int left, int top, FX_ARGB mask_argb, @@ -1635,10 +1635,10 @@ void CXFA_ImageRenderer::CompositeDIBitmap( FX_RECT rect(left, top, left + pDIBitmap->GetWidth(), top + pDIBitmap->GetHeight()); rect.Intersect(m_pDevice->GetClipBox()); - CFX_RetainPtr<CFX_DIBitmap> pClone; + RetainPtr<CFX_DIBitmap> pClone; if (m_pDevice->GetBackDrop() && m_pDevice->GetBitmap()) { pClone = m_pDevice->GetBackDrop()->Clone(&rect); - CFX_RetainPtr<CFX_DIBitmap> pForeBitmap = m_pDevice->GetBitmap(); + RetainPtr<CFX_DIBitmap> pForeBitmap = m_pDevice->GetBitmap(); pClone->CompositeBitmap(0, 0, pClone->GetWidth(), pClone->GetHeight(), pForeBitmap, rect.left, rect.top); left = left >= 0 ? 0 : left; @@ -1667,8 +1667,7 @@ void CXFA_ImageRenderer::CompositeDIBitmap( (m_pDevice->GetRenderCaps() & FXRC_ALPHA_IMAGE)) { return; } - CFX_RetainPtr<CFX_DIBitmap> pCloneConvert = - pDIBitmap->CloneConvert(FXDIB_Rgb); + RetainPtr<CFX_DIBitmap> pCloneConvert = pDIBitmap->CloneConvert(FXDIB_Rgb); if (!pCloneConvert) return; @@ -1684,7 +1683,7 @@ void CXFA_ImageRenderer::CompositeDIBitmap( void XFA_DrawImage(CXFA_Graphics* pGS, const CFX_RectF& rtImage, const CFX_Matrix& matrix, - const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap, + const RetainPtr<CFX_DIBitmap>& pDIBitmap, int32_t iAspect, int32_t iImageXDpi, int32_t iImageYDpi, @@ -1885,11 +1884,11 @@ FXCODEC_IMAGE_TYPE XFA_GetImageType(const WideString& wsType) { return FXCODEC_IMAGE_UNKNOWN; } -CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, - CXFA_Image* pImage, - bool& bNameImage, - int32_t& iImageXDpi, - int32_t& iImageYDpi) { +RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, + CXFA_Image* pImage, + bool& bNameImage, + int32_t& iImageXDpi, + int32_t& iImageYDpi) { WideString wsHref; WideString wsImage; pImage->GetHref(wsHref); @@ -1902,7 +1901,7 @@ CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, FXCODEC_IMAGE_TYPE type = XFA_GetImageType(wsContentType); ByteString bsContent; uint8_t* pImageBuffer = nullptr; - CFX_RetainPtr<IFX_SeekableReadStream> pImageFileRead; + RetainPtr<IFX_SeekableReadStream> pImageFileRead; if (wsImage.GetLength() > 0) { XFA_ATTRIBUTEENUM iEncoding = (XFA_ATTRIBUTEENUM)pImage->GetTransferEncoding(); @@ -1924,7 +1923,7 @@ CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, } else { WideString wsURL = wsHref; if (wsURL.Left(7) != L"http://" && wsURL.Left(6) != L"ftp://") { - CFX_RetainPtr<CFX_DIBitmap> pBitmap = + RetainPtr<CFX_DIBitmap> pBitmap = pDoc->GetPDFNamedImage(wsURL.AsStringView(), iImageXDpi, iImageYDpi); if (pBitmap) { bNameImage = true; @@ -1938,7 +1937,7 @@ CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, return nullptr; } bNameImage = false; - CFX_RetainPtr<CFX_DIBitmap> pBitmap = + RetainPtr<CFX_DIBitmap> pBitmap = XFA_LoadImageFromBuffer(pImageFileRead, type, iImageXDpi, iImageYDpi); FX_Free(pImageBuffer); return pBitmap; @@ -1964,8 +1963,8 @@ static FXDIB_Format XFA_GetDIBFormat(FXCODEC_IMAGE_TYPE type, return dibFormat; } -CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer( - const CFX_RetainPtr<IFX_SeekableReadStream>& pImageFileRead, +RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer( + const RetainPtr<IFX_SeekableReadStream>& pImageFileRead, FXCODEC_IMAGE_TYPE type, int32_t& iImageXDpi, int32_t& iImageYDpi) { @@ -1998,7 +1997,7 @@ CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer( int32_t iComponents = pProgressiveDecoder->GetNumComponents(); int32_t iBpc = pProgressiveDecoder->GetBPC(); FXDIB_Format dibFormat = XFA_GetDIBFormat(type, iComponents, iBpc); - CFX_RetainPtr<CFX_DIBitmap> pBitmap = pdfium::MakeRetain<CFX_DIBitmap>(); + RetainPtr<CFX_DIBitmap> pBitmap = pdfium::MakeRetain<CFX_DIBitmap>(); pBitmap->Create(pProgressiveDecoder->GetWidth(), pProgressiveDecoder->GetHeight(), dibFormat); pBitmap->Clear(0xffffffff); diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h index 41bb94164b..c743742890 100644 --- a/xfa/fxfa/cxfa_ffwidget.h +++ b/xfa/fxfa/cxfa_ffwidget.h @@ -42,21 +42,21 @@ CFX_GraphStateData::LineCap XFA_LineCapToFXGE(int32_t iLineCap); void XFA_DrawImage(CXFA_Graphics* pGS, const CFX_RectF& rtImage, const CFX_Matrix& matrix, - const CFX_RetainPtr<CFX_DIBitmap>& pDIBitmap, + const RetainPtr<CFX_DIBitmap>& pDIBitmap, int32_t iAspect, int32_t iImageXDpi, int32_t iImageYDpi, int32_t iHorzAlign = XFA_ATTRIBUTEENUM_Left, int32_t iVertAlign = XFA_ATTRIBUTEENUM_Top); -CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, - CXFA_Image* pImage, - bool& bNameImage, - int32_t& iImageXDpi, - int32_t& iImageYDpi); +RetainPtr<CFX_DIBitmap> XFA_LoadImageData(CXFA_FFDoc* pDoc, + CXFA_Image* pImage, + bool& bNameImage, + int32_t& iImageXDpi, + int32_t& iImageYDpi); -CFX_RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer( - const CFX_RetainPtr<IFX_SeekableReadStream>& pImageFileRead, +RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer( + const RetainPtr<IFX_SeekableReadStream>& pImageFileRead, FXCODEC_IMAGE_TYPE type, int32_t& iImageXDpi, int32_t& iImageYDpi); diff --git a/xfa/fxfa/cxfa_fileread.h b/xfa/fxfa/cxfa_fileread.h index 2dba4d23df..62fa4c67bb 100644 --- a/xfa/fxfa/cxfa_fileread.h +++ b/xfa/fxfa/cxfa_fileread.h @@ -9,8 +9,8 @@ #include <vector> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_stream.h" +#include "core/fxcrt/retain_ptr.h" class CPDF_Stream; class CPDF_StreamAcc; @@ -30,7 +30,7 @@ class CXFA_FileRead : public IFX_SeekableStream { bool WriteBlock(const void* pData, FX_FILESIZE offset, size_t size) override; private: - std::vector<CFX_RetainPtr<CPDF_StreamAcc>> m_Data; + std::vector<RetainPtr<CPDF_StreamAcc>> m_Data; }; #endif // XFA_FXFA_CXFA_FILEREAD_H_ diff --git a/xfa/fxfa/cxfa_fontmgr.cpp b/xfa/fxfa/cxfa_fontmgr.cpp index 5a11dd5dc0..ddf8ffada4 100644 --- a/xfa/fxfa/cxfa_fontmgr.cpp +++ b/xfa/fxfa/cxfa_fontmgr.cpp @@ -23,7 +23,7 @@ CXFA_FontMgr::CXFA_FontMgr() {} CXFA_FontMgr::~CXFA_FontMgr() {} -CFX_RetainPtr<CFGAS_GEFont> CXFA_FontMgr::GetFont( +RetainPtr<CFGAS_GEFont> CXFA_FontMgr::GetFont( CXFA_FFDoc* hDoc, const WideStringView& wsFontFamily, uint32_t dwFontStyles, @@ -39,7 +39,7 @@ CFX_RetainPtr<CFGAS_GEFont> CXFA_FontMgr::GetFont( CFGAS_PDFFontMgr* pMgr = hDoc->GetPDFFontMgr(); CPDF_Font* pPDFFont = nullptr; - CFX_RetainPtr<CFGAS_GEFont> pFont; + RetainPtr<CFGAS_GEFont> pFont; if (pMgr) { pFont = pMgr->GetFont(wsEnglishName.AsStringView(), dwFontStyles, &pPDFFont, true); diff --git a/xfa/fxfa/cxfa_fontmgr.h b/xfa/fxfa/cxfa_fontmgr.h index b7d1f51ff2..55ee6bbc4d 100644 --- a/xfa/fxfa/cxfa_fontmgr.h +++ b/xfa/fxfa/cxfa_fontmgr.h @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" #include "xfa/fgas/font/cfgas_defaultfontmanager.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" @@ -26,15 +26,15 @@ class CXFA_FontMgr { CXFA_FontMgr(); ~CXFA_FontMgr(); - CFX_RetainPtr<CFGAS_GEFont> GetFont(CXFA_FFDoc* hDoc, - const WideStringView& wsFontFamily, - uint32_t dwFontStyles, - uint16_t wCodePage = 0xFFFF); + RetainPtr<CFGAS_GEFont> GetFont(CXFA_FFDoc* hDoc, + const WideStringView& wsFontFamily, + uint32_t dwFontStyles, + uint16_t wCodePage = 0xFFFF); void SetDefFontMgr(std::unique_ptr<CFGAS_DefaultFontManager> pFontMgr); private: std::unique_ptr<CFGAS_DefaultFontManager> m_pDefFontMgr; - std::map<ByteString, CFX_RetainPtr<CFGAS_GEFont>> m_FontMap; + std::map<ByteString, RetainPtr<CFGAS_GEFont>> m_FontMap; }; #endif // XFA_FXFA_CXFA_FONTMGR_H_ diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp index 35456eff16..f27b5ddef5 100644 --- a/xfa/fxfa/cxfa_fwltheme.cpp +++ b/xfa/fxfa/cxfa_fwltheme.cpp @@ -185,7 +185,7 @@ float CXFA_FWLTheme::GetFontSize(CFWL_ThemePart* pThemePart) const { return FWLTHEME_CAPACITY_FontSize; } -CFX_RetainPtr<CFGAS_GEFont> CXFA_FWLTheme::GetFont( +RetainPtr<CFGAS_GEFont> CXFA_FWLTheme::GetFont( CFWL_ThemePart* pThemePart) const { if (CXFA_FFWidget* pWidget = XFA_ThemeGetOuterWidget(pThemePart->m_pWidget)) return pWidget->GetDataAcc()->GetFDEFont(); diff --git a/xfa/fxfa/cxfa_fwltheme.h b/xfa/fxfa/cxfa_fwltheme.h index 48fb744cb2..7813545447 100644 --- a/xfa/fxfa/cxfa_fwltheme.h +++ b/xfa/fxfa/cxfa_fwltheme.h @@ -37,8 +37,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { float GetCYBorderSize() const override; CFX_RectF GetUIMargin(CFWL_ThemePart* pThemePart) const override; float GetFontSize(CFWL_ThemePart* pThemePart) const override; - CFX_RetainPtr<CFGAS_GEFont> GetFont( - CFWL_ThemePart* pThemePart) const override; + RetainPtr<CFGAS_GEFont> GetFont(CFWL_ThemePart* pThemePart) const override; float GetLineHeight(CFWL_ThemePart* pThemePart) const override; float GetScrollBarWidth() const override; FX_COLORREF GetTextColor(CFWL_ThemePart* pThemePart) const override; @@ -59,7 +58,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { std::unique_ptr<CFWL_CaretTP> m_pCaretTP; std::unique_ptr<CFWL_BarcodeTP> m_pBarcodeTP; std::unique_ptr<CFDE_TextOut> m_pTextOut; - CFX_RetainPtr<CFGAS_GEFont> m_pCalendarFont; + RetainPtr<CFGAS_GEFont> m_pCalendarFont; WideString m_wsResource; CFX_UnownedPtr<CXFA_FFApp> const m_pApp; CFX_RectF m_Rect; diff --git a/xfa/fxfa/cxfa_linkuserdata.h b/xfa/fxfa/cxfa_linkuserdata.h index 7a9648c9b5..3d0f95e91c 100644 --- a/xfa/fxfa/cxfa_linkuserdata.h +++ b/xfa/fxfa/cxfa_linkuserdata.h @@ -7,14 +7,14 @@ #ifndef XFA_FXFA_CXFA_LINKUSERDATA_H_ #define XFA_FXFA_CXFA_LINKUSERDATA_H_ -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" -class CXFA_LinkUserData : public CFX_Retainable { +class CXFA_LinkUserData : public Retainable { public: template <typename T, typename... Args> - friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args); + friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); const wchar_t* GetLinkURL() const { return m_wsURLContent.c_str(); } diff --git a/xfa/fxfa/cxfa_loadercontext.h b/xfa/fxfa/cxfa_loadercontext.h index 64ab50696b..06e3f117d8 100644 --- a/xfa/fxfa/cxfa_loadercontext.h +++ b/xfa/fxfa/cxfa_loadercontext.h @@ -31,7 +31,7 @@ class CXFA_LoaderContext { uint32_t m_dwFlags; CFX_XMLNode* m_pXMLNode; CXFA_Node* m_pNode; - CFX_RetainPtr<CFX_CSSComputedStyle> m_pParentStyle; + RetainPtr<CFX_CSSComputedStyle> m_pParentStyle; std::vector<float> m_lineHeights; std::vector<float> m_BlocksHeight; }; diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index bbc61d40f2..038f451ad9 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp @@ -689,9 +689,9 @@ bool CXFA_TextLayout::LoadRichText( CFX_XMLNode* pXMLNode, const CFX_SizeF& szText, float& fLinePos, - const CFX_RetainPtr<CFX_CSSComputedStyle>& pParentStyle, + const RetainPtr<CFX_CSSComputedStyle>& pParentStyle, bool bSavePieces, - CFX_RetainPtr<CXFA_LinkUserData> pLinkData, + RetainPtr<CXFA_LinkUserData> pLinkData, bool bEndBreak, bool bIsOl, int32_t iLiCount) { @@ -703,7 +703,7 @@ bool CXFA_TextLayout::LoadRichText( CFX_CSSDisplay eDisplay = CFX_CSSDisplay::None; bool bContentNode = false; float fSpaceBelow = 0; - CFX_RetainPtr<CFX_CSSComputedStyle> pStyle; + RetainPtr<CFX_CSSComputedStyle> pStyle; WideString wsName; if (bEndBreak) { bool bCurOl = false; @@ -1008,7 +1008,7 @@ void CXFA_TextLayout::AppendTextLine(CFX_BreakType dwStatus, if (iPieces < 1) return; - CFX_RetainPtr<CFX_CSSComputedStyle> pStyle; + RetainPtr<CFX_CSSComputedStyle> pStyle; if (bSavePieces) { auto pNew = pdfium::MakeUnique<CXFA_PieceLine>(); CXFA_PieceLine* pPieceLine = pNew.get(); diff --git a/xfa/fxfa/cxfa_textlayout.h b/xfa/fxfa/cxfa_textlayout.h index 50ee83fd75..5856826166 100644 --- a/xfa/fxfa/cxfa_textlayout.h +++ b/xfa/fxfa/cxfa_textlayout.h @@ -79,9 +79,9 @@ class CXFA_TextLayout { bool LoadRichText(CFX_XMLNode* pXMLNode, const CFX_SizeF& szText, float& fLinePos, - const CFX_RetainPtr<CFX_CSSComputedStyle>& pParentStyle, + const RetainPtr<CFX_CSSComputedStyle>& pParentStyle, bool bSavePieces, - CFX_RetainPtr<CXFA_LinkUserData> pLinkData, + RetainPtr<CXFA_LinkUserData> pLinkData, bool bEndBreak = true, bool bIsOl = false, int32_t iLiCount = 0); diff --git a/xfa/fxfa/cxfa_textparsecontext.h b/xfa/fxfa/cxfa_textparsecontext.h index 3cd5710728..20d914bc59 100644 --- a/xfa/fxfa/cxfa_textparsecontext.h +++ b/xfa/fxfa/cxfa_textparsecontext.h @@ -29,7 +29,7 @@ class CXFA_TextParseContext { } const std::vector<const CFX_CSSDeclaration*>& GetDecls() { return decls_; } - CFX_RetainPtr<CFX_CSSComputedStyle> m_pParentStyle; + RetainPtr<CFX_CSSComputedStyle> m_pParentStyle; private: std::vector<const CFX_CSSDeclaration*> decls_; diff --git a/xfa/fxfa/cxfa_textparser.cpp b/xfa/fxfa/cxfa_textparser.cpp index 3c78a8686d..9cbb72aa19 100644 --- a/xfa/fxfa/cxfa_textparser.cpp +++ b/xfa/fxfa/cxfa_textparser.cpp @@ -88,7 +88,7 @@ std::unique_ptr<CFX_CSSStyleSheet> CXFA_TextParser::LoadDefaultSheetStyle() { : nullptr; } -CFX_RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateRootStyle( +RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateRootStyle( CXFA_TextProvider* pTextProvider) { CXFA_Font font = pTextProvider->GetFontNode(); CXFA_Para para = pTextProvider->GetParaNode(); @@ -150,7 +150,7 @@ CFX_RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateRootStyle( return pStyle; } -CFX_RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateStyle( +RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateStyle( CFX_CSSComputedStyle* pParentStyle) { auto pNewStyle = m_pSelector->CreateComputedStyle(pParentStyle); ASSERT(pNewStyle); @@ -171,7 +171,7 @@ CFX_RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::CreateStyle( return pNewStyle; } -CFX_RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::ComputeStyle( +RetainPtr<CFX_CSSComputedStyle> CXFA_TextParser::ComputeStyle( CFX_XMLNode* pXMLNode, CFX_CSSComputedStyle* pParentStyle) { auto it = m_mapXMLNodeToParseContext.find(pXMLNode); @@ -215,7 +215,7 @@ void CXFA_TextParser::ParseRichText(CFX_XMLNode* pXMLNode, if (!tagProvider->m_bTagAvailable) return; - CFX_RetainPtr<CFX_CSSComputedStyle> pNewStyle; + RetainPtr<CFX_CSSComputedStyle> pNewStyle; if ((tagProvider->GetTagName() != L"body") || (tagProvider->GetTagName() != L"html")) { auto pTextContext = pdfium::MakeUnique<CXFA_TextParseContext>(); @@ -315,7 +315,7 @@ bool CXFA_TextParser::IsSpaceRun(CFX_CSSComputedStyle* pStyle) const { return false; } -CFX_RetainPtr<CFGAS_GEFont> CXFA_TextParser::GetFont( +RetainPtr<CFGAS_GEFont> CXFA_TextParser::GetFont( CXFA_TextProvider* pTextProvider, CFX_CSSComputedStyle* pStyle) const { WideStringView wsFamily = L"Courier"; diff --git a/xfa/fxfa/cxfa_textparser.h b/xfa/fxfa/cxfa_textparser.h index ee5c38d2af..9a2232efa1 100644 --- a/xfa/fxfa/cxfa_textparser.h +++ b/xfa/fxfa/cxfa_textparser.h @@ -10,9 +10,9 @@ #include <map> #include <memory> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" #include "core/fxge/fx_dib.h" #include "xfa/fgas/font/cfgas_gefont.h" @@ -32,9 +32,9 @@ class CXFA_TextParser { void Reset(); void DoParse(CFX_XMLNode* pXMLContainer, CXFA_TextProvider* pTextProvider); - CFX_RetainPtr<CFX_CSSComputedStyle> CreateRootStyle( + RetainPtr<CFX_CSSComputedStyle> CreateRootStyle( CXFA_TextProvider* pTextProvider); - CFX_RetainPtr<CFX_CSSComputedStyle> ComputeStyle( + RetainPtr<CFX_CSSComputedStyle> ComputeStyle( CFX_XMLNode* pXMLNode, CFX_CSSComputedStyle* pParentStyle); @@ -49,8 +49,8 @@ class CXFA_TextParser { bool GetTabstops(CFX_CSSComputedStyle* pStyle, CXFA_TextTabstopsContext* pTabstopContext); - CFX_RetainPtr<CFGAS_GEFont> GetFont(CXFA_TextProvider* pTextProvider, - CFX_CSSComputedStyle* pStyle) const; + RetainPtr<CFGAS_GEFont> GetFont(CXFA_TextProvider* pTextProvider, + CFX_CSSComputedStyle* pStyle) const; float GetFontSize(CXFA_TextProvider* pTextProvider, CFX_CSSComputedStyle* pStyle) const; @@ -113,7 +113,7 @@ class CXFA_TextParser { void ParseRichText(CFX_XMLNode* pXMLNode, CFX_CSSComputedStyle* pParentStyle); std::unique_ptr<TagProvider> ParseTagInfo(CFX_XMLNode* pXMLNode); std::unique_ptr<CFX_CSSStyleSheet> LoadDefaultSheetStyle(); - CFX_RetainPtr<CFX_CSSComputedStyle> CreateStyle( + RetainPtr<CFX_CSSComputedStyle> CreateStyle( CFX_CSSComputedStyle* pParentStyle); bool m_bParsed; diff --git a/xfa/fxfa/cxfa_textpiece.h b/xfa/fxfa/cxfa_textpiece.h index 4ea5a4158c..b5025d2970 100644 --- a/xfa/fxfa/cxfa_textpiece.h +++ b/xfa/fxfa/cxfa_textpiece.h @@ -33,8 +33,8 @@ class CXFA_TextPiece { FX_ARGB dwColor; float fFontSize; CFX_RectF rtPiece; - CFX_RetainPtr<CFGAS_GEFont> pFont; - CFX_RetainPtr<CXFA_LinkUserData> pLinkData; + RetainPtr<CFGAS_GEFont> pFont; + RetainPtr<CXFA_LinkUserData> pLinkData; }; #endif // XFA_FXFA_CXFA_TEXTPIECE_H_ diff --git a/xfa/fxfa/cxfa_textuserdata.cpp b/xfa/fxfa/cxfa_textuserdata.cpp index 51a2f43194..6c46978609 100644 --- a/xfa/fxfa/cxfa_textuserdata.cpp +++ b/xfa/fxfa/cxfa_textuserdata.cpp @@ -12,12 +12,12 @@ #include "xfa/fxfa/cxfa_linkuserdata.h" CXFA_TextUserData::CXFA_TextUserData( - const CFX_RetainPtr<CFX_CSSComputedStyle>& pStyle) + const RetainPtr<CFX_CSSComputedStyle>& pStyle) : m_pStyle(pStyle) {} CXFA_TextUserData::CXFA_TextUserData( - const CFX_RetainPtr<CFX_CSSComputedStyle>& pStyle, - const CFX_RetainPtr<CXFA_LinkUserData>& pLinkData) + const RetainPtr<CFX_CSSComputedStyle>& pStyle, + const RetainPtr<CXFA_LinkUserData>& pLinkData) : m_pStyle(pStyle), m_pLinkData(pLinkData) {} CXFA_TextUserData::~CXFA_TextUserData() {} diff --git a/xfa/fxfa/cxfa_textuserdata.h b/xfa/fxfa/cxfa_textuserdata.h index 442e6318c0..c1af217bf1 100644 --- a/xfa/fxfa/cxfa_textuserdata.h +++ b/xfa/fxfa/cxfa_textuserdata.h @@ -7,23 +7,23 @@ #ifndef XFA_FXFA_CXFA_TEXTUSERDATA_H_ #define XFA_FXFA_CXFA_TEXTUSERDATA_H_ -#include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/retain_ptr.h" class CFX_CSSComputedStyle; class CXFA_LinkUserData; -class CXFA_TextUserData : public CFX_Retainable { +class CXFA_TextUserData : public Retainable { public: template <typename T, typename... Args> - friend CFX_RetainPtr<T> pdfium::MakeRetain(Args&&... args); + friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); - CFX_RetainPtr<CFX_CSSComputedStyle> m_pStyle; - CFX_RetainPtr<CXFA_LinkUserData> m_pLinkData; + RetainPtr<CFX_CSSComputedStyle> m_pStyle; + RetainPtr<CXFA_LinkUserData> m_pLinkData; private: - explicit CXFA_TextUserData(const CFX_RetainPtr<CFX_CSSComputedStyle>& pStyle); - CXFA_TextUserData(const CFX_RetainPtr<CFX_CSSComputedStyle>& pStyle, - const CFX_RetainPtr<CXFA_LinkUserData>& pLinkData); + explicit CXFA_TextUserData(const RetainPtr<CFX_CSSComputedStyle>& pStyle); + CXFA_TextUserData(const RetainPtr<CFX_CSSComputedStyle>& pStyle, + const RetainPtr<CXFA_LinkUserData>& pLinkData); ~CXFA_TextUserData() override; }; diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp index 791b814d9e..260581e73b 100644 --- a/xfa/fxfa/cxfa_widgetacc.cpp +++ b/xfa/fxfa/cxfa_widgetacc.cpp @@ -91,7 +91,7 @@ class CXFA_ImageLayoutData : public CXFA_WidgetLayoutData { return !!m_pDIBitmap; } - CFX_RetainPtr<CFX_DIBitmap> m_pDIBitmap; + RetainPtr<CFX_DIBitmap> m_pDIBitmap; bool m_bNamedImage; int32_t m_iImageXDpi; int32_t m_iImageYDpi; @@ -147,7 +147,7 @@ class CXFA_ImageEditData : public CXFA_FieldLayoutData { return !!m_pDIBitmap; } - CFX_RetainPtr<CFX_DIBitmap> m_pDIBitmap; + RetainPtr<CFX_DIBitmap> m_pDIBitmap; bool m_bNamedImage; int32_t m_iImageXDpi; int32_t m_iImageYDpi; @@ -919,7 +919,7 @@ bool CXFA_WidgetAcc::CalculateImageAutoSize(CFX_SizeF& size) { LoadImageImage(); size.clear(); - CFX_RetainPtr<CFX_DIBitmap> pBitmap = GetImageImage(); + RetainPtr<CFX_DIBitmap> pBitmap = GetImageImage(); if (pBitmap) { int32_t iImageXDpi = 0; int32_t iImageYDpi = 0; @@ -949,7 +949,7 @@ bool CXFA_WidgetAcc::CalculateImageEditAutoSize(CFX_SizeF& size) { LoadImageEditImage(); size.clear(); - CFX_RetainPtr<CFX_DIBitmap> pBitmap = GetImageEditImage(); + RetainPtr<CFX_DIBitmap> pBitmap = GetImageEditImage(); if (pBitmap) { int32_t iImageXDpi = 0; int32_t iImageYDpi = 0; @@ -1459,22 +1459,21 @@ CXFA_TextLayout* CXFA_WidgetAcc::GetTextLayout() { : nullptr; } -CFX_RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageImage() { +RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageImage() { return m_pLayoutData ? static_cast<CXFA_ImageLayoutData*>(m_pLayoutData.get()) ->m_pDIBitmap : nullptr; } -CFX_RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageEditImage() { +RetainPtr<CFX_DIBitmap> CXFA_WidgetAcc::GetImageEditImage() { return m_pLayoutData ? static_cast<CXFA_ImageEditData*>(m_pLayoutData.get()) ->m_pDIBitmap : nullptr; } -void CXFA_WidgetAcc::SetImageImage( - const CFX_RetainPtr<CFX_DIBitmap>& newImage) { +void CXFA_WidgetAcc::SetImageImage(const RetainPtr<CFX_DIBitmap>& newImage) { CXFA_ImageLayoutData* pData = static_cast<CXFA_ImageLayoutData*>(m_pLayoutData.get()); if (pData->m_pDIBitmap != newImage) @@ -1482,7 +1481,7 @@ void CXFA_WidgetAcc::SetImageImage( } void CXFA_WidgetAcc::SetImageEditImage( - const CFX_RetainPtr<CFX_DIBitmap>& newImage) { + const RetainPtr<CFX_DIBitmap>& newImage) { CXFA_ImageEditData* pData = static_cast<CXFA_ImageEditData*>(m_pLayoutData.get()); if (pData->m_pDIBitmap != newImage) @@ -1493,7 +1492,7 @@ CXFA_WidgetLayoutData* CXFA_WidgetAcc::GetWidgetLayoutData() { return m_pLayoutData.get(); } -CFX_RetainPtr<CFGAS_GEFont> CXFA_WidgetAcc::GetFDEFont() { +RetainPtr<CFGAS_GEFont> CXFA_WidgetAcc::GetFDEFont() { WideStringView wsFontName = L"Courier"; uint32_t dwFontStyle = 0; if (CXFA_Font font = GetFont(false)) { diff --git a/xfa/fxfa/cxfa_widgetacc.h b/xfa/fxfa/cxfa_widgetacc.h index 54fd36077d..be26b94806 100644 --- a/xfa/fxfa/cxfa_widgetacc.h +++ b/xfa/fxfa/cxfa_widgetacc.h @@ -9,8 +9,8 @@ #include <memory> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/retain_ptr.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" #include "xfa/fxfa/parser/cxfa_box.h" @@ -70,14 +70,14 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { void GetImageEditDpi(int32_t& iImageXDpi, int32_t& iImageYDpi); CXFA_TextLayout* GetCaptionTextLayout(); CXFA_TextLayout* GetTextLayout(); - CFX_RetainPtr<CFX_DIBitmap> GetImageImage(); - CFX_RetainPtr<CFX_DIBitmap> GetImageEditImage(); - void SetImageImage(const CFX_RetainPtr<CFX_DIBitmap>& newImage); - void SetImageEditImage(const CFX_RetainPtr<CFX_DIBitmap>& newImage); + RetainPtr<CFX_DIBitmap> GetImageImage(); + RetainPtr<CFX_DIBitmap> GetImageEditImage(); + void SetImageImage(const RetainPtr<CFX_DIBitmap>& newImage); + void SetImageEditImage(const RetainPtr<CFX_DIBitmap>& newImage); void UpdateUIDisplay(CXFA_FFWidget* pExcept = nullptr); CXFA_Node* GetDatasets(); - CFX_RetainPtr<CFGAS_GEFont> GetFDEFont(); + RetainPtr<CFGAS_GEFont> GetFDEFont(); float GetFontSize(); FX_ARGB GetTextColor(); float GetLineHeight(); diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp index 6af7bb7445..0b38fd1fab 100644 --- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.cpp @@ -4591,7 +4591,7 @@ void CXFA_FM2JSContext::Get(CFXJSE_Value* pThis, std::unique_ptr<CFXJSE_Value> argOne = GetSimpleValue(pThis, args, 0); ByteString urlString = ValueToUTF8String(argOne.get()); - CFX_RetainPtr<IFX_SeekableReadStream> pFile = + RetainPtr<IFX_SeekableReadStream> pFile = pAppProvider->DownloadURL(WideString::FromUTF8(urlString.AsStringView())); if (!pFile) return; diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h index b8595d41dd..929594ff38 100644 --- a/xfa/fxfa/fxfa.h +++ b/xfa/fxfa/fxfa.h @@ -9,7 +9,7 @@ #include <vector> -#include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/retain_ptr.h" #include "xfa/fxfa/cxfa_widgetacc.h" #include "xfa/fxfa/fxfa_basic.h" @@ -170,7 +170,7 @@ class IXFA_AppProvider { * @param[in] wsURL - http, ftp, such as * "http://www.w3.org/TR/REC-xml-names/". */ - virtual CFX_RetainPtr<IFX_SeekableReadStream> DownloadURL( + virtual RetainPtr<IFX_SeekableReadStream> DownloadURL( const WideString& wsURL) = 0; /** @@ -259,7 +259,7 @@ class IXFA_DocEnvironment { virtual bool SetGlobalProperty(CXFA_FFDoc* hDoc, const ByteStringView& szPropName, CFXJSE_Value* pValue) = 0; - virtual CFX_RetainPtr<IFX_SeekableReadStream> OpenLinkedFile( + virtual RetainPtr<IFX_SeekableReadStream> OpenLinkedFile( CXFA_FFDoc* hDoc, const WideString& wsLink) = 0; }; diff --git a/xfa/fxfa/parser/cxfa_dataexporter.cpp b/xfa/fxfa/parser/cxfa_dataexporter.cpp index edc7b23b6b..b0de057e2a 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataexporter.cpp @@ -328,7 +328,7 @@ void RegenerateFormFile_Changed(CXFA_Node* pNode, void RegenerateFormFile_Container( CXFA_Node* pNode, - const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream, + const RetainPtr<CFX_SeekableStreamProxy>& pStream, bool bSaveXML) { XFA_Element eType = pNode->GetElementType(); if (eType == XFA_Element::Field || eType == XFA_Element::Draw || @@ -385,7 +385,7 @@ void RegenerateFormFile_Container( void XFA_DataExporter_RegenerateFormFile( CXFA_Node* pNode, - const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream, + const RetainPtr<CFX_SeekableStreamProxy>& pStream, const char* pChecksum, bool bSaveXML) { if (pNode->IsModelNode()) { @@ -460,12 +460,11 @@ CXFA_DataExporter::CXFA_DataExporter(CXFA_Document* pDocument) CXFA_DataExporter::~CXFA_DataExporter() {} -bool CXFA_DataExporter::Export( - const CFX_RetainPtr<IFX_SeekableStream>& pWrite) { +bool CXFA_DataExporter::Export(const RetainPtr<IFX_SeekableStream>& pWrite) { return Export(pWrite, m_pDocument->GetRoot(), 0, nullptr); } -bool CXFA_DataExporter::Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite, +bool CXFA_DataExporter::Export(const RetainPtr<IFX_SeekableStream>& pWrite, CXFA_Node* pNode, uint32_t dwFlag, const char* pChecksum) { @@ -479,7 +478,7 @@ bool CXFA_DataExporter::Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite, } bool CXFA_DataExporter::Export( - const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream, + const RetainPtr<CFX_SeekableStreamProxy>& pStream, CXFA_Node* pNode, uint32_t dwFlag, const char* pChecksum) { diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h index 4c0d90af9e..0820560c87 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.h +++ b/xfa/fxfa/parser/cxfa_dataexporter.h @@ -7,8 +7,8 @@ #ifndef XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_ #define XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_ -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/retain_ptr.h" class CXFA_Document; class CXFA_Node; @@ -20,14 +20,14 @@ class CXFA_DataExporter { explicit CXFA_DataExporter(CXFA_Document* pDocument); ~CXFA_DataExporter(); - bool Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite); - bool Export(const CFX_RetainPtr<IFX_SeekableStream>& pWrite, + bool Export(const RetainPtr<IFX_SeekableStream>& pWrite); + bool Export(const RetainPtr<IFX_SeekableStream>& pWrite, CXFA_Node* pNode, uint32_t dwFlag, const char* pChecksum); private: - bool Export(const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream, + bool Export(const RetainPtr<CFX_SeekableStreamProxy>& pStream, CXFA_Node* pNode, uint32_t dwFlag, const char* pChecksum); diff --git a/xfa/fxfa/parser/cxfa_dataimporter.cpp b/xfa/fxfa/parser/cxfa_dataimporter.cpp index e4ae3d0796..ab18f6182d 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.cpp +++ b/xfa/fxfa/parser/cxfa_dataimporter.cpp @@ -25,7 +25,7 @@ CXFA_DataImporter::CXFA_DataImporter(CXFA_Document* pDocument) CXFA_DataImporter::~CXFA_DataImporter() {} bool CXFA_DataImporter::ImportData( - const CFX_RetainPtr<IFX_SeekableStream>& pDataDocument) { + const RetainPtr<IFX_SeekableStream>& pDataDocument) { auto pDataDocumentParser = pdfium::MakeUnique<CXFA_SimpleParser>(m_pDocument.Get(), false); if (pDataDocumentParser->StartParse(pDataDocument, XFA_XDPPACKET_Datasets) != diff --git a/xfa/fxfa/parser/cxfa_dataimporter.h b/xfa/fxfa/parser/cxfa_dataimporter.h index d3af1de517..dc7764ccad 100644 --- a/xfa/fxfa/parser/cxfa_dataimporter.h +++ b/xfa/fxfa/parser/cxfa_dataimporter.h @@ -7,9 +7,9 @@ #ifndef XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_ #define XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_ -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" class CXFA_Document; class IFX_SeekableStream; @@ -19,7 +19,7 @@ class CXFA_DataImporter { explicit CXFA_DataImporter(CXFA_Document* pDocument); ~CXFA_DataImporter(); - bool ImportData(const CFX_RetainPtr<IFX_SeekableStream>& pDataDocument); + bool ImportData(const RetainPtr<IFX_SeekableStream>& pDataDocument); private: CFX_UnownedPtr<CXFA_Document> const m_pDocument; diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index 99b36749d1..b8ff8f860c 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -18,7 +18,7 @@ CXFA_DocumentParser::~CXFA_DocumentParser() { } int32_t CXFA_DocumentParser::StartParse( - const CFX_RetainPtr<IFX_SeekableStream>& pStream, + const RetainPtr<IFX_SeekableStream>& pStream, XFA_XDPPACKET ePacketID) { m_pDocument.reset(); m_nodeParser.CloseParser(); diff --git a/xfa/fxfa/parser/cxfa_document_parser.h b/xfa/fxfa/parser/cxfa_document_parser.h index ad3f17f8e8..e788480751 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.h +++ b/xfa/fxfa/parser/cxfa_document_parser.h @@ -22,7 +22,7 @@ class CXFA_DocumentParser { explicit CXFA_DocumentParser(CXFA_FFNotify* pNotify); ~CXFA_DocumentParser(); - int32_t StartParse(const CFX_RetainPtr<IFX_SeekableStream>& pStream, + int32_t StartParse(const RetainPtr<IFX_SeekableStream>& pStream, XFA_XDPPACKET ePacketID); int32_t DoParse(); diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index 5b58761712..4574ae48d7 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -273,7 +273,7 @@ void CXFA_SimpleParser::SetFactory(CXFA_Document* pFactory) { } int32_t CXFA_SimpleParser::StartParse( - const CFX_RetainPtr<IFX_SeekableStream>& pStream, + const RetainPtr<IFX_SeekableStream>& pStream, XFA_XDPPACKET ePacketID) { CloseParser(); m_pFileRead = pStream; diff --git a/xfa/fxfa/parser/cxfa_simple_parser.h b/xfa/fxfa/parser/cxfa_simple_parser.h index 91bfb054b5..00250e7257 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.h +++ b/xfa/fxfa/parser/cxfa_simple_parser.h @@ -25,7 +25,7 @@ class CXFA_SimpleParser { CXFA_SimpleParser(CXFA_Document* pFactory, bool bDocumentParser); ~CXFA_SimpleParser(); - int32_t StartParse(const CFX_RetainPtr<IFX_SeekableStream>& pStream, + int32_t StartParse(const RetainPtr<IFX_SeekableStream>& pStream, XFA_XDPPACKET ePacketID); int32_t DoParse(); CFX_XMLNode* ParseXMLData(const ByteString& wsXML); @@ -77,8 +77,8 @@ class CXFA_SimpleParser { CFX_XMLParser* m_pXMLParser; std::unique_ptr<CFX_XMLDoc> m_pXMLDoc; - CFX_RetainPtr<CFX_SeekableStreamProxy> m_pStream; - CFX_RetainPtr<IFX_SeekableStream> m_pFileRead; + RetainPtr<CFX_SeekableStreamProxy> m_pStream; + RetainPtr<IFX_SeekableStream> m_pFileRead; CXFA_Document* m_pFactory; CXFA_Node* m_pRootNode; XFA_XDPPACKET m_ePacketID; diff --git a/xfa/fxfa/parser/xfa_utils.h b/xfa/fxfa/parser/xfa_utils.h index 404586bd56..b6839ef708 100644 --- a/xfa/fxfa/parser/xfa_utils.h +++ b/xfa/fxfa/parser/xfa_utils.h @@ -155,7 +155,7 @@ bool XFA_FieldIsMultiListBox(CXFA_Node* pFieldNode); void XFA_DataExporter_DealWithDataGroupNode(CXFA_Node* pDataNode); void XFA_DataExporter_RegenerateFormFile( CXFA_Node* pNode, - const CFX_RetainPtr<CFX_SeekableStreamProxy>& pStream, + const RetainPtr<CFX_SeekableStreamProxy>& pStream, const char* pChecksum = nullptr, bool bSaveXML = false); |