From aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 16:53:58 -0400 Subject: Move CFX_UnownedPtr to UnownedPtr This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0 Reviewed-on: https://pdfium-review.googlesource.com/14620 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fpdfapi/page/cpdf_colorspace.cpp | 2 +- core/fpdfapi/page/cpdf_colorspace.h | 6 +++--- core/fpdfapi/page/cpdf_contentmarkitem.h | 4 ++-- core/fpdfapi/page/cpdf_contentparser.h | 6 +++--- core/fpdfapi/page/cpdf_docpagedata.h | 4 ++-- core/fpdfapi/page/cpdf_generalstate.h | 12 ++++++------ core/fpdfapi/page/cpdf_iccprofile.h | 4 ++-- core/fpdfapi/page/cpdf_image.h | 6 +++--- core/fpdfapi/page/cpdf_meshstream.h | 4 ++-- core/fpdfapi/page/cpdf_pageobjectholder.h | 12 ++++++------ core/fpdfapi/page/cpdf_pattern.h | 6 +++--- core/fpdfapi/page/cpdf_shadingobject.h | 4 ++-- core/fpdfapi/page/cpdf_shadingpattern.h | 8 ++++---- core/fpdfapi/page/cpdf_streamcontentparser.h | 14 +++++++------- core/fpdfapi/page/cpdf_textstate.h | 4 ++-- 15 files changed, 48 insertions(+), 48 deletions(-) (limited to 'core/fpdfapi/page') diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp index f4980fbb99..97a0c1584c 100644 --- a/core/fpdfapi/page/cpdf_colorspace.cpp +++ b/core/fpdfapi/page/cpdf_colorspace.cpp @@ -196,7 +196,7 @@ class CPDF_IndexedCS : public CPDF_ColorSpace { void EnableStdConversion(bool bEnabled) override; CPDF_ColorSpace* m_pBaseCS; - CFX_UnownedPtr m_pCountedBaseCS; + UnownedPtr m_pCountedBaseCS; int m_nBaseComponents; int m_MaxIndex; ByteString m_Table; diff --git a/core/fpdfapi/page/cpdf_colorspace.h b/core/fpdfapi/page/cpdf_colorspace.h index d9f9a1dd44..ff10dfce6a 100644 --- a/core/fpdfapi/page/cpdf_colorspace.h +++ b/core/fpdfapi/page/cpdf_colorspace.h @@ -11,9 +11,9 @@ #include #include "core/fpdfapi/page/cpdf_pattern.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" #define PDFCS_DEVICEGRAY 1 #define PDFCS_DEVICERGB 2 @@ -83,10 +83,10 @@ class CPDF_ColorSpace { CPDF_Array* pArray, std::set* pVisited); - CFX_UnownedPtr const m_pDocument; + UnownedPtr const m_pDocument; int m_Family; uint32_t m_nComponents; - CFX_UnownedPtr m_pArray; + UnownedPtr m_pArray; uint32_t m_dwStdConversion; }; using CPDF_CountedColorSpace = CPDF_CountedObject; diff --git a/core/fpdfapi/page/cpdf_contentmarkitem.h b/core/fpdfapi/page/cpdf_contentmarkitem.h index 83c700fc52..ea89606816 100644 --- a/core/fpdfapi/page/cpdf_contentmarkitem.h +++ b/core/fpdfapi/page/cpdf_contentmarkitem.h @@ -9,10 +9,10 @@ #include -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; @@ -38,7 +38,7 @@ class CPDF_ContentMarkItem { private: ByteString m_MarkName; ParamType m_ParamType; - CFX_UnownedPtr m_pPropertiesDict; + UnownedPtr m_pPropertiesDict; std::unique_ptr m_pDirectDict; }; diff --git a/core/fpdfapi/page/cpdf_contentparser.h b/core/fpdfapi/page/cpdf_contentparser.h index c14f451209..b1e601a0e1 100644 --- a/core/fpdfapi/page/cpdf_contentparser.h +++ b/core/fpdfapi/page/cpdf_contentparser.h @@ -14,7 +14,7 @@ #include "core/fpdfapi/page/cpdf_pageobjectholder.h" #include "core/fpdfapi/page/cpdf_streamcontentparser.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_AllStates; class CPDF_Form; @@ -50,9 +50,9 @@ class CPDF_ContentParser { ParseStatus m_Status; InternalStage m_InternalStage; - CFX_UnownedPtr m_pObjectHolder; + UnownedPtr m_pObjectHolder; bool m_bForm; - CFX_UnownedPtr m_pType3Char; + UnownedPtr m_pType3Char; uint32_t m_nStreams; RetainPtr m_pSingleStream; std::vector> m_StreamArray; diff --git a/core/fpdfapi/page/cpdf_docpagedata.h b/core/fpdfapi/page/cpdf_docpagedata.h index 175bee21eb..02107aa2bb 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.h +++ b/core/fpdfapi/page/cpdf_docpagedata.h @@ -11,9 +11,9 @@ #include #include "core/fpdfapi/page/cpdf_colorspace.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_Document; @@ -69,7 +69,7 @@ class CPDF_DocPageData { using CPDF_CountedFont = CPDF_CountedObject; bool m_bForceClear; - CFX_UnownedPtr const m_pPDFDoc; + UnownedPtr const m_pPDFDoc; std::map m_HashProfileMap; std::map m_ColorSpaceMap; std::map> m_FontFileMap; diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h index 8721a45268..5abb87ea26 100644 --- a/core/fpdfapi/page/cpdf_generalstate.h +++ b/core/fpdfapi/page/cpdf_generalstate.h @@ -7,10 +7,10 @@ #ifndef CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_ #define CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/shared_copy_on_write.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CPDF_Object; @@ -85,11 +85,11 @@ class CPDF_GeneralState { ByteString m_BlendMode; int m_BlendType; - CFX_UnownedPtr m_pSoftMask; + UnownedPtr m_pSoftMask; CFX_Matrix m_SMaskMatrix; float m_StrokeAlpha; float m_FillAlpha; - CFX_UnownedPtr m_pTR; + UnownedPtr m_pTR; RetainPtr m_pTransferFunc; CFX_Matrix m_Matrix; int m_RenderIntent; @@ -99,9 +99,9 @@ class CPDF_GeneralState { bool m_StrokeOP; bool m_FillOP; int m_OPMode; - CFX_UnownedPtr m_pBG; - CFX_UnownedPtr m_pUCR; - CFX_UnownedPtr m_pHT; + UnownedPtr m_pBG; + UnownedPtr m_pUCR; + UnownedPtr m_pHT; float m_Flatness; float m_Smoothness; }; diff --git a/core/fpdfapi/page/cpdf_iccprofile.h b/core/fpdfapi/page/cpdf_iccprofile.h index 57d7c3eb79..1bc498aa1f 100644 --- a/core/fpdfapi/page/cpdf_iccprofile.h +++ b/core/fpdfapi/page/cpdf_iccprofile.h @@ -9,8 +9,8 @@ #include -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CLcmsCmm; class CPDF_Stream; @@ -32,7 +32,7 @@ class CPDF_IccProfile : public Retainable { ~CPDF_IccProfile() override; const bool m_bsRGB; - CFX_UnownedPtr const m_pStream; + UnownedPtr const m_pStream; std::unique_ptr m_Transform; uint32_t m_nSrcComponents = 0; }; diff --git a/core/fpdfapi/page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h index 51f342f4aa..a499932c4b 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_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/maybe_owned.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_DIBSource; class CFX_DIBitmap; @@ -78,10 +78,10 @@ class CPDF_Image : public Retainable { bool m_bIsInline = false; bool m_bIsMask = false; bool m_bInterpolate = false; - CFX_UnownedPtr const m_pDocument; + UnownedPtr const m_pDocument; MaybeOwned m_pStream; MaybeOwned m_pDict; - CFX_UnownedPtr m_pOC; + UnownedPtr m_pOC; }; #endif // CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_ diff --git a/core/fpdfapi/page/cpdf_meshstream.h b/core/fpdfapi/page/cpdf_meshstream.h index ddbe31fe07..7c34b25185 100644 --- a/core/fpdfapi/page/cpdf_meshstream.h +++ b/core/fpdfapi/page/cpdf_meshstream.h @@ -66,8 +66,8 @@ class CPDF_MeshStream { const ShadingType m_type; const std::vector>& m_funcs; - CFX_UnownedPtr const m_pShadingStream; - CFX_UnownedPtr const m_pCS; + UnownedPtr const m_pShadingStream; + UnownedPtr const m_pCS; uint32_t m_nCoordBits; uint32_t m_nComponentBits; uint32_t m_nFlagBits; diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h index c223d4b523..b7386f2c93 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.h +++ b/core/fpdfapi/page/cpdf_pageobjectholder.h @@ -12,10 +12,10 @@ #include #include "core/fpdfapi/page/cpdf_pageobjectlist.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class IFX_PauseIndicator; class CPDF_Dictionary; @@ -71,11 +71,11 @@ class CPDF_PageObjectHolder { void Transform(const CFX_Matrix& matrix); CFX_FloatRect CalcBoundingBox() const; - CFX_UnownedPtr m_pFormDict; - CFX_UnownedPtr m_pFormStream; - CFX_UnownedPtr m_pDocument; - CFX_UnownedPtr m_pPageResources; - CFX_UnownedPtr m_pResources; + UnownedPtr m_pFormDict; + UnownedPtr m_pFormStream; + UnownedPtr m_pDocument; + UnownedPtr m_pPageResources; + UnownedPtr m_pResources; std::map m_GraphicsMap; std::map m_FontsMap; CFX_FloatRect m_BBox; diff --git a/core/fpdfapi/page/cpdf_pattern.h b/core/fpdfapi/page/cpdf_pattern.h index 504b5b0ffc..307c677775 100644 --- a/core/fpdfapi/page/cpdf_pattern.h +++ b/core/fpdfapi/page/cpdf_pattern.h @@ -8,9 +8,9 @@ #define CORE_FPDFAPI_PAGE_CPDF_PATTERN_H_ #include "core/fpdfapi/page/cpdf_countedobject.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Document; class CPDF_Object; @@ -40,8 +40,8 @@ class CPDF_Pattern { void SetPatternToFormMatrix(); private: - CFX_UnownedPtr const m_pDocument; - CFX_UnownedPtr const m_pPatternObj; + UnownedPtr const m_pDocument; + UnownedPtr const m_pPatternObj; CFX_Matrix m_Pattern2Form; const CFX_Matrix m_ParentMatrix; }; diff --git a/core/fpdfapi/page/cpdf_shadingobject.h b/core/fpdfapi/page/cpdf_shadingobject.h index 9db6712824..a5405cb090 100644 --- a/core/fpdfapi/page/cpdf_shadingobject.h +++ b/core/fpdfapi/page/cpdf_shadingobject.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_PAGE_CPDF_SHADINGOBJECT_H_ #include "core/fpdfapi/page/cpdf_pageobject.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_ShadingPattern; @@ -27,7 +27,7 @@ class CPDF_ShadingObject : public CPDF_PageObject { void CalcBoundingBox(); - CFX_UnownedPtr m_pShading; + UnownedPtr m_pShading; CFX_Matrix m_Matrix; }; diff --git a/core/fpdfapi/page/cpdf_shadingpattern.h b/core/fpdfapi/page/cpdf_shadingpattern.h index 24ad4c200e..d0fafef0db 100644 --- a/core/fpdfapi/page/cpdf_shadingpattern.h +++ b/core/fpdfapi/page/cpdf_shadingpattern.h @@ -12,8 +12,8 @@ #include "core/fpdfapi/page/cpdf_colorspace.h" #include "core/fpdfapi/page/cpdf_pattern.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" enum ShadingType { kInvalidShading = 0, @@ -63,13 +63,13 @@ class CPDF_ShadingPattern : public CPDF_Pattern { private: ShadingType m_ShadingType; bool m_bShadingObj; - CFX_UnownedPtr m_pShadingObj; + UnownedPtr m_pShadingObj; // Still keep |m_pCS| as some CPDF_ColorSpace (name object) are not managed // as counted objects. Refer to CPDF_DocPageData::GetColorSpace. - CFX_UnownedPtr m_pCS; + UnownedPtr m_pCS; - CFX_UnownedPtr m_pCountedCS; + UnownedPtr m_pCountedCS; std::vector> m_pFunctions; }; diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.h b/core/fpdfapi/page/cpdf_streamcontentparser.h index 59bd7bdc37..e905c937b3 100644 --- a/core/fpdfapi/page/cpdf_streamcontentparser.h +++ b/core/fpdfapi/page/cpdf_streamcontentparser.h @@ -193,12 +193,12 @@ class CPDF_StreamContentParser { void Handle_NextLineShowText_Space(); void Handle_Invalid(); - CFX_UnownedPtr const m_pDocument; - CFX_UnownedPtr m_pPageResources; - CFX_UnownedPtr m_pParentResources; - CFX_UnownedPtr m_pResources; - CFX_UnownedPtr m_pObjectHolder; - CFX_UnownedPtr> m_ParsedSet; + UnownedPtr const m_pDocument; + UnownedPtr m_pPageResources; + UnownedPtr m_pParentResources; + UnownedPtr m_pResources; + UnownedPtr m_pObjectHolder; + UnownedPtr> m_ParsedSet; CFX_Matrix m_mtContentToUser; const CFX_FloatRect m_BBox; ContentParam m_ParamBuf[kParamBufSize]; @@ -208,7 +208,7 @@ class CPDF_StreamContentParser { std::unique_ptr m_pCurStates; CPDF_ContentMark m_CurContentMark; std::vector> m_ClipTextList; - CFX_UnownedPtr m_pLastTextObject; + UnownedPtr m_pLastTextObject; float m_DefFontSize; std::vector m_PathPoints; float m_PathStartX; diff --git a/core/fpdfapi/page/cpdf_textstate.h b/core/fpdfapi/page/cpdf_textstate.h index 1e9ea04e6a..2a48702318 100644 --- a/core/fpdfapi/page/cpdf_textstate.h +++ b/core/fpdfapi/page/cpdf_textstate.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_ #define CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/shared_copy_on_write.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Document; class CPDF_Font; @@ -72,7 +72,7 @@ class CPDF_TextState { float GetShearAngle() const; CPDF_Font* m_pFont; - CFX_UnownedPtr m_pDocument; + UnownedPtr m_pDocument; float m_FontSize; float m_CharSpace; float m_WordSpace; -- cgit v1.2.3