From 0b95042db2e6dab5876abd12ce485fff0a8e08fe Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 15:49:49 -0400 Subject: Rename CFX_RetainPtr to RetainPtr This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e Reviewed-on: https://pdfium-review.googlesource.com/14616 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fpdfapi/page/cpdf_colorspace.cpp | 2 +- core/fpdfapi/page/cpdf_contentparser.h | 4 ++-- core/fpdfapi/page/cpdf_docpagedata.cpp | 6 +++--- core/fpdfapi/page/cpdf_docpagedata.h | 12 ++++++------ core/fpdfapi/page/cpdf_generalstate.cpp | 4 ++-- core/fpdfapi/page/cpdf_generalstate.h | 6 +++--- core/fpdfapi/page/cpdf_iccprofile.h | 6 +++--- core/fpdfapi/page/cpdf_image.cpp | 21 ++++++++++----------- core/fpdfapi/page/cpdf_image.h | 25 ++++++++++++------------- core/fpdfapi/page/cpdf_imageobject.cpp | 2 +- core/fpdfapi/page/cpdf_imageobject.h | 6 +++--- core/fpdfapi/page/cpdf_meshstream.h | 2 +- core/fpdfapi/page/cpdf_sampledfunc.h | 8 +++----- core/fpdfapi/page/cpdf_streamcontentparser.cpp | 2 +- core/fpdfapi/page/cpdf_streamcontentparser.h | 4 ++-- 15 files changed, 53 insertions(+), 57 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp index 5455d4dbba..f4980fbb99 100644 --- a/core/fpdfapi/page/cpdf_colorspace.cpp +++ b/core/fpdfapi/page/cpdf_colorspace.cpp @@ -177,7 +177,7 @@ class CPDF_ICCBasedCS : public CPDF_ColorSpace { void PopulateRanges(CPDF_Dictionary* pDict); MaybeOwned m_pAlterCS; - CFX_RetainPtr m_pProfile; + RetainPtr m_pProfile; uint8_t* m_pCache; float* m_pRanges; }; diff --git a/core/fpdfapi/page/cpdf_contentparser.h b/core/fpdfapi/page/cpdf_contentparser.h index b201f95df8..c14f451209 100644 --- a/core/fpdfapi/page/cpdf_contentparser.h +++ b/core/fpdfapi/page/cpdf_contentparser.h @@ -54,8 +54,8 @@ class CPDF_ContentParser { bool m_bForm; CFX_UnownedPtr m_pType3Char; uint32_t m_nStreams; - CFX_RetainPtr m_pSingleStream; - std::vector> m_StreamArray; + RetainPtr m_pSingleStream; + std::vector> m_StreamArray; uint8_t* m_pData; uint32_t m_Size; uint32_t m_CurrentOffset; diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp index 08345dac78..31d6bae63f 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.cpp +++ b/core/fpdfapi/page/cpdf_docpagedata.cpp @@ -389,7 +389,7 @@ void CPDF_DocPageData::ReleasePattern(const CPDF_Object* pPatternObj) { pPattern->clear(); } -CFX_RetainPtr CPDF_DocPageData::GetImage(uint32_t dwStreamObjNum) { +RetainPtr CPDF_DocPageData::GetImage(uint32_t dwStreamObjNum) { ASSERT(dwStreamObjNum); auto it = m_ImageMap.find(dwStreamObjNum); if (it != m_ImageMap.end()) @@ -407,7 +407,7 @@ void CPDF_DocPageData::MaybePurgeImage(uint32_t dwStreamObjNum) { m_ImageMap.erase(it); } -CFX_RetainPtr CPDF_DocPageData::GetIccProfile( +RetainPtr CPDF_DocPageData::GetIccProfile( CPDF_Stream* pProfileStream) { if (!pProfileStream) return nullptr; @@ -443,7 +443,7 @@ void CPDF_DocPageData::MaybePurgeIccProfile(CPDF_Stream* pProfileStream) { m_IccProfileMap.erase(it); } -CFX_RetainPtr CPDF_DocPageData::GetFontFileStreamAcc( +RetainPtr CPDF_DocPageData::GetFontFileStreamAcc( CPDF_Stream* pFontStream) { ASSERT(pFontStream); auto it = m_FontFileMap.find(pFontStream); diff --git a/core/fpdfapi/page/cpdf_docpagedata.h b/core/fpdfapi/page/cpdf_docpagedata.h index 3f1d392262..175bee21eb 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.h +++ b/core/fpdfapi/page/cpdf_docpagedata.h @@ -53,13 +53,13 @@ class CPDF_DocPageData { const CFX_Matrix& matrix); void ReleasePattern(const CPDF_Object* pPatternObj); - CFX_RetainPtr GetImage(uint32_t dwStreamObjNum); + RetainPtr GetImage(uint32_t dwStreamObjNum); void MaybePurgeImage(uint32_t dwStreamObjNum); - CFX_RetainPtr GetIccProfile(CPDF_Stream* pProfileStream); + RetainPtr GetIccProfile(CPDF_Stream* pProfileStream); void MaybePurgeIccProfile(CPDF_Stream* pProfileStream); - CFX_RetainPtr GetFontFileStreamAcc(CPDF_Stream* pFontStream); + RetainPtr GetFontFileStreamAcc(CPDF_Stream* pFontStream); void MaybePurgeFontFileStreamAcc(const CPDF_Stream* pFontStream); CPDF_CountedColorSpace* FindColorSpacePtr(CPDF_Object* pCSObj) const; @@ -72,10 +72,10 @@ class CPDF_DocPageData { CFX_UnownedPtr const m_pPDFDoc; std::map m_HashProfileMap; std::map m_ColorSpaceMap; - std::map> m_FontFileMap; + std::map> m_FontFileMap; std::map m_FontMap; - std::map> m_IccProfileMap; - std::map> m_ImageMap; + std::map> m_IccProfileMap; + std::map> m_ImageMap; std::map m_PatternMap; }; diff --git a/core/fpdfapi/page/cpdf_generalstate.cpp b/core/fpdfapi/page/cpdf_generalstate.cpp index c5c259f051..6f4062fb65 100644 --- a/core/fpdfapi/page/cpdf_generalstate.cpp +++ b/core/fpdfapi/page/cpdf_generalstate.cpp @@ -161,13 +161,13 @@ void CPDF_GeneralState::SetTR(CPDF_Object* pObject) { m_Ref.GetPrivateCopy()->m_pTR = pObject; } -CFX_RetainPtr CPDF_GeneralState::GetTransferFunc() const { +RetainPtr CPDF_GeneralState::GetTransferFunc() const { const StateData* pData = m_Ref.GetObject(); return pData ? pData->m_pTransferFunc : nullptr; } void CPDF_GeneralState::SetTransferFunc( - const CFX_RetainPtr& pFunc) { + const RetainPtr& pFunc) { m_Ref.GetPrivateCopy()->m_pTransferFunc = pFunc; } diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h index 95f59784f2..a55f1a7b33 100644 --- a/core/fpdfapi/page/cpdf_generalstate.h +++ b/core/fpdfapi/page/cpdf_generalstate.h @@ -43,8 +43,8 @@ class CPDF_GeneralState { CPDF_Object* GetTR() const; void SetTR(CPDF_Object* pObject); - CFX_RetainPtr GetTransferFunc() const; - void SetTransferFunc(const CFX_RetainPtr& pFunc); + RetainPtr GetTransferFunc() const; + void SetTransferFunc(const RetainPtr& pFunc); void SetBlendMode(const ByteString& mode); @@ -90,7 +90,7 @@ class CPDF_GeneralState { float m_StrokeAlpha; float m_FillAlpha; CFX_UnownedPtr m_pTR; - CFX_RetainPtr m_pTransferFunc; + RetainPtr m_pTransferFunc; CFX_Matrix m_Matrix; int m_RenderIntent; bool m_StrokeAdjust; diff --git a/core/fpdfapi/page/cpdf_iccprofile.h b/core/fpdfapi/page/cpdf_iccprofile.h index 0226a5678d..57d7c3eb79 100644 --- a/core/fpdfapi/page/cpdf_iccprofile.h +++ b/core/fpdfapi/page/cpdf_iccprofile.h @@ -9,16 +9,16 @@ #include -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/retain_ptr.h" class CLcmsCmm; class CPDF_Stream; -class CPDF_IccProfile : public CFX_Retainable { +class CPDF_IccProfile : public Retainable { public: template - friend CFX_RetainPtr pdfium::MakeRetain(Args&&... args); + friend RetainPtr pdfium::MakeRetain(Args&&... args); CPDF_Stream* GetStream() const { return m_pStream.Get(); } bool IsValid() const { return IsSRGB() || IsSupported(); } diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index f748b6950d..4c08336e3a 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -117,8 +117,7 @@ std::unique_ptr CPDF_Image::InitJPEG(uint8_t* pData, return pDict; } -void CPDF_Image::SetJpegImage( - const CFX_RetainPtr& pFile) { +void CPDF_Image::SetJpegImage(const RetainPtr& pFile) { uint32_t size = pdfium::base::checked_cast(pFile->GetSize()); if (!size) return; @@ -142,7 +141,7 @@ void CPDF_Image::SetJpegImage( } void CPDF_Image::SetJpegImageInline( - const CFX_RetainPtr& pFile) { + const RetainPtr& pFile) { uint32_t size = pdfium::base::checked_cast(pFile->GetSize()); if (!size) return; @@ -158,7 +157,7 @@ void CPDF_Image::SetJpegImageInline( m_pStream->InitStream(&(data[0]), size, std::move(pDict)); } -void CPDF_Image::SetImage(const CFX_RetainPtr& pBitmap) { +void CPDF_Image::SetImage(const RetainPtr& pBitmap) { int32_t BitmapWidth = pBitmap->GetWidth(); int32_t BitmapHeight = pBitmap->GetHeight(); if (BitmapWidth < 1 || BitmapHeight < 1) @@ -250,7 +249,7 @@ void CPDF_Image::SetImage(const CFX_RetainPtr& pBitmap) { bCopyWithoutAlpha = false; } - CFX_RetainPtr pMaskBitmap; + RetainPtr pMaskBitmap; if (pBitmap->HasAlpha()) pMaskBitmap = pBitmap->CloneAlphaMask(); @@ -323,12 +322,12 @@ void CPDF_Image::SetImage(const CFX_RetainPtr& pBitmap) { } void CPDF_Image::ResetCache(CPDF_Page* pPage, - const CFX_RetainPtr& pBitmap) { - CFX_RetainPtr pHolder(this); + const RetainPtr& pBitmap) { + RetainPtr pHolder(this); pPage->GetRenderCache()->ResetBitmap(pHolder, pBitmap); } -CFX_RetainPtr CPDF_Image::LoadDIBSource() const { +RetainPtr CPDF_Image::LoadDIBSource() const { auto source = pdfium::MakeRetain(); if (!source->Load(m_pDocument.Get(), m_pStream.Get())) return nullptr; @@ -336,11 +335,11 @@ CFX_RetainPtr CPDF_Image::LoadDIBSource() const { return source; } -CFX_RetainPtr CPDF_Image::DetachBitmap() { +RetainPtr CPDF_Image::DetachBitmap() { return std::move(m_pDIBSource); } -CFX_RetainPtr CPDF_Image::DetachMask() { +RetainPtr CPDF_Image::DetachMask() { return std::move(m_pMask); } @@ -367,7 +366,7 @@ bool CPDF_Image::StartLoadDIBSource(CPDF_Dictionary* pFormResource, } bool CPDF_Image::Continue(IFX_PauseIndicator* pPause) { - CFX_RetainPtr pSource = m_pDIBSource.As(); + RetainPtr pSource = m_pDIBSource.As(); int ret = pSource->ContinueLoadDIBSource(pPause); if (!ret) { m_pDIBSource.Reset(); diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index ddfd95ccf3..51f342f4aa 100644 --- a/core/fpdfapi/page/cpdf_image.h +++ b/core/fpdfapi/page/cpdf_image.h @@ -10,10 +10,10 @@ #include #include "core/fpdfapi/parser/cpdf_stream.h" -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/maybe_owned.h" +#include "core/fxcrt/retain_ptr.h" class CFX_DIBSource; class CFX_DIBitmap; @@ -22,10 +22,10 @@ class CPDF_Page; class IFX_PauseIndicator; class IFX_SeekableReadStream; -class CPDF_Image : public CFX_Retainable { +class CPDF_Image : public Retainable { public: template - friend CFX_RetainPtr pdfium::MakeRetain(Args&&... args); + friend RetainPtr pdfium::MakeRetain(Args&&... args); void ConvertStreamToIndirectObject(); @@ -44,25 +44,24 @@ class CPDF_Image : public CFX_Retainable { bool IsMask() const { return m_bIsMask; } bool IsInterpol() const { return m_bInterpolate; } - CFX_RetainPtr LoadDIBSource() const; + RetainPtr LoadDIBSource() const; - void SetImage(const CFX_RetainPtr& pDIBitmap); - void SetJpegImage(const CFX_RetainPtr& pFile); - void SetJpegImageInline(const CFX_RetainPtr& pFile); + void SetImage(const RetainPtr& pDIBitmap); + void SetJpegImage(const RetainPtr& pFile); + void SetJpegImageInline(const RetainPtr& pFile); - void ResetCache(CPDF_Page* pPage, - const CFX_RetainPtr& pDIBitmap); + void ResetCache(CPDF_Page* pPage, const RetainPtr& pDIBitmap); bool StartLoadDIBSource(CPDF_Dictionary* pFormResource, CPDF_Dictionary* pPageResource, bool bStdCS = false, uint32_t GroupFamily = 0, bool bLoadMask = false); bool Continue(IFX_PauseIndicator* pPause); - CFX_RetainPtr DetachBitmap(); - CFX_RetainPtr DetachMask(); + RetainPtr DetachBitmap(); + RetainPtr DetachMask(); - CFX_RetainPtr m_pDIBSource; - CFX_RetainPtr m_pMask; + RetainPtr m_pDIBSource; + RetainPtr m_pMask; uint32_t m_MatteColor = 0; private: diff --git a/core/fpdfapi/page/cpdf_imageobject.cpp b/core/fpdfapi/page/cpdf_imageobject.cpp index dd07385db4..3b5a740155 100644 --- a/core/fpdfapi/page/cpdf_imageobject.cpp +++ b/core/fpdfapi/page/cpdf_imageobject.cpp @@ -45,7 +45,7 @@ void CPDF_ImageObject::CalcBoundingBox() { m_Matrix.TransformRect(0.f, 1.f, 1.f, 0.f); } -void CPDF_ImageObject::SetImage(const CFX_RetainPtr& pImage) { +void CPDF_ImageObject::SetImage(const RetainPtr& pImage) { MaybePurgeCache(); m_pImage = pImage; } diff --git a/core/fpdfapi/page/cpdf_imageobject.h b/core/fpdfapi/page/cpdf_imageobject.h index 484fb7baa6..16a506e537 100644 --- a/core/fpdfapi/page/cpdf_imageobject.h +++ b/core/fpdfapi/page/cpdf_imageobject.h @@ -27,8 +27,8 @@ class CPDF_ImageObject : public CPDF_PageObject { const CPDF_ImageObject* AsImage() const override; void CalcBoundingBox(); - CFX_RetainPtr GetImage() const { return m_pImage; } - void SetImage(const CFX_RetainPtr& pImage); + RetainPtr GetImage() const { return m_pImage; } + void SetImage(const RetainPtr& pImage); void set_matrix(const CFX_Matrix& matrix) { m_Matrix = matrix; } const CFX_Matrix& matrix() const { return m_Matrix; } @@ -36,7 +36,7 @@ class CPDF_ImageObject : public CPDF_PageObject { void MaybePurgeCache(); CFX_Matrix m_Matrix; - CFX_RetainPtr m_pImage; + RetainPtr m_pImage; }; #endif // CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_ diff --git a/core/fpdfapi/page/cpdf_meshstream.h b/core/fpdfapi/page/cpdf_meshstream.h index 0a06381c68..ddbe31fe07 100644 --- a/core/fpdfapi/page/cpdf_meshstream.h +++ b/core/fpdfapi/page/cpdf_meshstream.h @@ -80,7 +80,7 @@ class CPDF_MeshStream { float m_ymax; float m_ColorMin[kMaxComponents]; float m_ColorMax[kMaxComponents]; - CFX_RetainPtr m_pStream; + RetainPtr m_pStream; std::unique_ptr m_BitStream; }; diff --git a/core/fpdfapi/page/cpdf_sampledfunc.h b/core/fpdfapi/page/cpdf_sampledfunc.h index 59fe1ef141..d6dfed575f 100644 --- a/core/fpdfapi/page/cpdf_sampledfunc.h +++ b/core/fpdfapi/page/cpdf_sampledfunc.h @@ -11,7 +11,7 @@ #include "core/fpdfapi/page/cpdf_function.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -#include "core/fxcrt/cfx_retain_ptr.h" +#include "core/fxcrt/retain_ptr.h" class CPDF_SampledFunc : public CPDF_Function { public: @@ -37,16 +37,14 @@ class CPDF_SampledFunc : public CPDF_Function { return m_EncodeInfo; } uint32_t GetBitsPerSample() const { return m_nBitsPerSample; } - CFX_RetainPtr GetSampleStream() const { - return m_pSampleStream; - } + RetainPtr GetSampleStream() const { return m_pSampleStream; } private: std::vector m_EncodeInfo; std::vector m_DecodeInfo; uint32_t m_nBitsPerSample; uint32_t m_SampleMax; - CFX_RetainPtr m_pSampleStream; + RetainPtr m_pSampleStream; }; #endif // CORE_FPDFAPI_PAGE_CPDF_SAMPLEDFUNC_H_ diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp index c58e456238..47aa20938a 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp +++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp @@ -806,7 +806,7 @@ CPDF_ImageObject* CPDF_StreamContentParser::AddImage(uint32_t streamObjNum) { } CPDF_ImageObject* CPDF_StreamContentParser::AddImage( - const CFX_RetainPtr& pImage) { + const RetainPtr& pImage) { if (!pImage) return nullptr; diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h index c30c6b7d3c..59bd7bdc37 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.h +++ b/core/fpdfapi/page/cpdf_streamcontentparser.h @@ -106,7 +106,7 @@ class CPDF_StreamContentParser { void AddPathObject(int FillType, bool bStroke); CPDF_ImageObject* AddImage(std::unique_ptr pStream); CPDF_ImageObject* AddImage(uint32_t streamObjNum); - CPDF_ImageObject* AddImage(const CFX_RetainPtr& pImage); + CPDF_ImageObject* AddImage(const RetainPtr& pImage); void AddForm(CPDF_Stream* pStream); void SetGraphicStates(CPDF_PageObject* pObj, @@ -217,7 +217,7 @@ class CPDF_StreamContentParser { float m_PathCurrentY; uint8_t m_PathClipType; ByteString m_LastImageName; - CFX_RetainPtr m_pLastImage; + RetainPtr m_pLastImage; bool m_bColored; float m_Type3Data[6]; bool m_bResourceMissing; -- cgit v1.2.3