diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 16:53:58 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 21:25:26 +0000 |
| commit | aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch) | |
| tree | 1e14d60adcffeb0791a0a6c8792d3e9c0109384e | |
| parent | 8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff) | |
| download | pdfium-aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d.tar.xz | |
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 <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
185 files changed, 478 insertions, 471 deletions
@@ -821,7 +821,6 @@ static_library("fxcrt") { "core/fxcrt/cfx_fixedbufgrow.h", "core/fxcrt/cfx_memorystream.cpp", "core/fxcrt/cfx_memorystream.h", - "core/fxcrt/cfx_unowned_ptr.h", "core/fxcrt/cfx_utf8decoder.cpp", "core/fxcrt/cfx_utf8decoder.h", "core/fxcrt/cfx_weak_ptr.h", @@ -858,6 +857,7 @@ static_library("fxcrt") { "core/fxcrt/string_data_template.h", "core/fxcrt/string_pool_template.h", "core/fxcrt/string_view_template.h", + "core/fxcrt/unowned_ptr.h", "core/fxcrt/widestring.cpp", "core/fxcrt/widestring.h", "core/fxcrt/xml/cxml_attritem.cpp", @@ -1920,7 +1920,6 @@ test("pdfium_unittests") { "core/fxcodec/jbig2/JBig2_BitStream_unittest.cpp", "core/fxcodec/jbig2/JBig2_Image_unittest.cpp", "core/fxcrt/bytestring_unittest.cpp", - "core/fxcrt/cfx_unowned_ptr_unittest.cpp", "core/fxcrt/cfx_weak_ptr_unittest.cpp", "core/fxcrt/fx_bidi_unittest.cpp", "core/fxcrt/fx_coordinates_unittest.cpp", @@ -1934,6 +1933,7 @@ test("pdfium_unittests") { "core/fxcrt/retain_ptr_unittest.cpp", "core/fxcrt/shared_copy_on_write_unittest.cpp", "core/fxcrt/string_pool_template_unittest.cpp", + "core/fxcrt/unowned_ptr_unittest.cpp", "core/fxcrt/widestring_unittest.cpp", "core/fxge/dib/cstretchengine_unittest.cpp", "fpdfsdk/fpdfdoc_unittest.cpp", diff --git a/core/fpdfapi/edit/cpdf_creator.h b/core/fpdfapi/edit/cpdf_creator.h index 3ea5da85b7..e8fe18f87d 100644 --- a/core/fpdfapi/edit/cpdf_creator.h +++ b/core/fpdfapi/edit/cpdf_creator.h @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Array; class CPDF_CryptoHandler; @@ -80,13 +80,13 @@ class CPDF_Creator { bool IsXRefNeedEnd(); - CFX_UnownedPtr<CPDF_Document> const m_pDocument; - CFX_UnownedPtr<CPDF_Parser> const m_pParser; + UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Parser> const m_pParser; bool m_bSecurityChanged; - CFX_UnownedPtr<CPDF_Dictionary> m_pEncryptDict; + UnownedPtr<CPDF_Dictionary> m_pEncryptDict; uint32_t m_dwEncryptObjNum; RetainPtr<CPDF_CryptoHandler> m_pCryptoHandler; - CFX_UnownedPtr<CPDF_Object> m_pMetadata; + UnownedPtr<CPDF_Object> m_pMetadata; uint32_t m_dwLastObjNum; std::unique_ptr<IFX_ArchiveStream> m_Archive; FX_FILESIZE m_SavedOffset; diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h index 433ad3361a..efc5739c4b 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h @@ -10,9 +10,9 @@ #include <sstream> #include <vector> -#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" class CPDF_Document; class CPDF_ImageObject; @@ -40,9 +40,9 @@ class CPDF_PageContentGenerator { ByteString RealizeResource(uint32_t dwResourceObjNum, const ByteString& bsType); - CFX_UnownedPtr<CPDF_PageObjectHolder> const m_pObjHolder; - CFX_UnownedPtr<CPDF_Document> const m_pDocument; - std::vector<CFX_UnownedPtr<CPDF_PageObject>> m_pageObjects; + UnownedPtr<CPDF_PageObjectHolder> const m_pObjHolder; + UnownedPtr<CPDF_Document> const m_pDocument; + std::vector<UnownedPtr<CPDF_PageObject>> m_pageObjects; }; #endif // CORE_FPDFAPI_EDIT_CPDF_PAGECONTENTGENERATOR_H_ diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h index 653cc5f98e..f6ff83d8fa 100644 --- a/core/fpdfapi/font/cpdf_cidfont.h +++ b/core/fpdfapi/font/cpdf_cidfont.h @@ -11,10 +11,10 @@ #include <vector> #include "core/fpdfapi/font/cpdf_font.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" enum CIDSet : uint8_t { CIDSET_UNKNOWN, @@ -74,7 +74,7 @@ class CPDF_CIDFont : public CPDF_Font { wchar_t GetUnicodeFromCharCode(uint32_t charcode) const; RetainPtr<CPDF_CMap> m_pCMap; - CFX_UnownedPtr<CPDF_CID2UnicodeMap> m_pCID2UnicodeMap; + UnownedPtr<CPDF_CID2UnicodeMap> m_pCID2UnicodeMap; CIDSet m_Charset; bool m_bType1; bool m_bCIDIsGID; diff --git a/core/fpdfapi/font/cpdf_cmapparser.h b/core/fpdfapi/font/cpdf_cmapparser.h index b3c8326b98..874f6a776d 100644 --- a/core/fpdfapi/font/cpdf_cmapparser.h +++ b/core/fpdfapi/font/cpdf_cmapparser.h @@ -13,7 +13,7 @@ #include "core/fpdfapi/font/cpdf_cidfont.h" #include "core/fpdfapi/font/cpdf_cmap.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_CMapParser { public: @@ -39,7 +39,7 @@ class CPDF_CMapParser { const ByteStringView& first, const ByteStringView& second); - CFX_UnownedPtr<CPDF_CMap> const m_pCMap; + UnownedPtr<CPDF_CMap> const m_pCMap; int m_Status; int m_CodeSeq; uint32_t m_CodePoints[4]; diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h index 570d5d5a11..1611e56f2a 100644 --- a/core/fpdfapi/font/cpdf_font.h +++ b/core/fpdfapi/font/cpdf_font.h @@ -12,9 +12,9 @@ #include "core/fpdfapi/font/cpdf_tounicodemap.h" #include "core/fpdfapi/parser/cpdf_stream_acc.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" #include "core/fxge/fx_font.h" class CFX_SubstFont; @@ -107,7 +107,7 @@ class CPDF_Font { const std::vector<ByteString>& charnames, int charcode); - CFX_UnownedPtr<CPDF_Document> m_pDocument; + UnownedPtr<CPDF_Document> m_pDocument; CFX_Font m_Font; std::vector<std::unique_ptr<CFX_Font>> m_FontFallbacks; ByteString m_BaseFont; diff --git a/core/fpdfapi/font/cpdf_fontglobals.h b/core/fpdfapi/font/cpdf_fontglobals.h index 6f9b0918db..239a757528 100644 --- a/core/fpdfapi/font/cpdf_fontglobals.h +++ b/core/fpdfapi/font/cpdf_fontglobals.h @@ -29,7 +29,7 @@ class CPDF_FontGlobals { CPDF_CMapManager m_CMapManager; struct { - CFX_UnownedPtr<const FXCMAP_CMap> m_pMapList; + UnownedPtr<const FXCMAP_CMap> m_pMapList; uint32_t m_Count; } m_EmbeddedCharsets[CIDSET_NUM_SETS]; struct { diff --git a/core/fpdfapi/font/cpdf_tounicodemap.h b/core/fpdfapi/font/cpdf_tounicodemap.h index 4e11140e75..62fc470c98 100644 --- a/core/fpdfapi/font/cpdf_tounicodemap.h +++ b/core/fpdfapi/font/cpdf_tounicodemap.h @@ -10,8 +10,8 @@ #include <map> #include "core/fpdfapi/parser/cpdf_stream.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/cfx_widetextbuf.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_CID2UnicodeMap; @@ -35,7 +35,7 @@ class CPDF_ToUnicodeMap { uint32_t GetUnicode(); std::map<uint32_t, uint32_t> m_Map; - CFX_UnownedPtr<CPDF_CID2UnicodeMap> m_pBaseMap; + UnownedPtr<CPDF_CID2UnicodeMap> m_pBaseMap; CFX_WideTextBuf m_MultiCharBuf; }; diff --git a/core/fpdfapi/font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h index 135a19fb7c..913e0048a3 100644 --- a/core/fpdfapi/font/cpdf_type3font.h +++ b/core/fpdfapi/font/cpdf_type3font.h @@ -48,9 +48,9 @@ class CPDF_Type3Font : public CPDF_SimpleFont { void LoadGlyphMap() override {} int m_CharWidthL[256]; - CFX_UnownedPtr<CPDF_Dictionary> m_pCharProcs; - CFX_UnownedPtr<CPDF_Dictionary> m_pPageResources; - CFX_UnownedPtr<CPDF_Dictionary> m_pFontResources; + UnownedPtr<CPDF_Dictionary> m_pCharProcs; + UnownedPtr<CPDF_Dictionary> m_pPageResources; + UnownedPtr<CPDF_Dictionary> m_pFontResources; std::map<uint32_t, std::unique_ptr<CPDF_Type3Char>> m_CacheMap; // The depth char loading is in, to avoid recurive calling LoadChar(). int m_CharLoadingDepth; 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<CPDF_CountedColorSpace> m_pCountedBaseCS; + UnownedPtr<CPDF_CountedColorSpace> 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 <set> #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<CPDF_Object*>* pVisited); - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; int m_Family; uint32_t m_nComponents; - CFX_UnownedPtr<CPDF_Array> m_pArray; + UnownedPtr<CPDF_Array> m_pArray; uint32_t m_dwStdConversion; }; using CPDF_CountedColorSpace = CPDF_CountedObject<CPDF_ColorSpace>; 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 <memory> -#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<CPDF_Dictionary> m_pPropertiesDict; + UnownedPtr<CPDF_Dictionary> m_pPropertiesDict; std::unique_ptr<CPDF_Dictionary> 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<CPDF_PageObjectHolder> m_pObjectHolder; + UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder; bool m_bForm; - CFX_UnownedPtr<CPDF_Type3Char> m_pType3Char; + UnownedPtr<CPDF_Type3Char> m_pType3Char; uint32_t m_nStreams; RetainPtr<CPDF_StreamAcc> m_pSingleStream; std::vector<RetainPtr<CPDF_StreamAcc>> 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 <set> #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<CPDF_Font>; bool m_bForceClear; - CFX_UnownedPtr<CPDF_Document> const m_pPDFDoc; + UnownedPtr<CPDF_Document> const m_pPDFDoc; std::map<ByteString, CPDF_Stream*> m_HashProfileMap; std::map<const CPDF_Object*, CPDF_CountedColorSpace*> m_ColorSpaceMap; std::map<const CPDF_Stream*, RetainPtr<CPDF_StreamAcc>> 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<CPDF_Object> m_pSoftMask; + UnownedPtr<CPDF_Object> m_pSoftMask; CFX_Matrix m_SMaskMatrix; float m_StrokeAlpha; float m_FillAlpha; - CFX_UnownedPtr<CPDF_Object> m_pTR; + UnownedPtr<CPDF_Object> m_pTR; RetainPtr<CPDF_TransferFunc> 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<CPDF_Object> m_pBG; - CFX_UnownedPtr<CPDF_Object> m_pUCR; - CFX_UnownedPtr<CPDF_Object> m_pHT; + UnownedPtr<CPDF_Object> m_pBG; + UnownedPtr<CPDF_Object> m_pUCR; + UnownedPtr<CPDF_Object> 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 <memory> -#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<CPDF_Stream> const m_pStream; + UnownedPtr<CPDF_Stream> const m_pStream; std::unique_ptr<CLcmsCmm> 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 <memory> #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<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; MaybeOwned<CPDF_Stream> m_pStream; MaybeOwned<CPDF_Dictionary> m_pDict; - CFX_UnownedPtr<CPDF_Dictionary> m_pOC; + UnownedPtr<CPDF_Dictionary> 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<std::unique_ptr<CPDF_Function>>& m_funcs; - CFX_UnownedPtr<CPDF_Stream> const m_pShadingStream; - CFX_UnownedPtr<CPDF_ColorSpace> const m_pCS; + UnownedPtr<CPDF_Stream> const m_pShadingStream; + UnownedPtr<CPDF_ColorSpace> 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 <vector> #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<CPDF_Dictionary> m_pFormDict; - CFX_UnownedPtr<CPDF_Stream> m_pFormStream; - CFX_UnownedPtr<CPDF_Document> m_pDocument; - CFX_UnownedPtr<CPDF_Dictionary> m_pPageResources; - CFX_UnownedPtr<CPDF_Dictionary> m_pResources; + UnownedPtr<CPDF_Dictionary> m_pFormDict; + UnownedPtr<CPDF_Stream> m_pFormStream; + UnownedPtr<CPDF_Document> m_pDocument; + UnownedPtr<CPDF_Dictionary> m_pPageResources; + UnownedPtr<CPDF_Dictionary> m_pResources; std::map<GraphicsData, ByteString> m_GraphicsMap; std::map<FontData, ByteString> 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<CPDF_Document> const m_pDocument; - CFX_UnownedPtr<CPDF_Object> const m_pPatternObj; + UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Object> 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<CPDF_ShadingPattern> m_pShading; + UnownedPtr<CPDF_ShadingPattern> 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<CPDF_Object> m_pShadingObj; + UnownedPtr<CPDF_Object> 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<CPDF_ColorSpace> m_pCS; + UnownedPtr<CPDF_ColorSpace> m_pCS; - CFX_UnownedPtr<CPDF_CountedColorSpace> m_pCountedCS; + UnownedPtr<CPDF_CountedColorSpace> m_pCountedCS; std::vector<std::unique_ptr<CPDF_Function>> 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<CPDF_Document> const m_pDocument; - CFX_UnownedPtr<CPDF_Dictionary> m_pPageResources; - CFX_UnownedPtr<CPDF_Dictionary> m_pParentResources; - CFX_UnownedPtr<CPDF_Dictionary> m_pResources; - CFX_UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder; - CFX_UnownedPtr<std::set<const uint8_t*>> m_ParsedSet; + UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Dictionary> m_pPageResources; + UnownedPtr<CPDF_Dictionary> m_pParentResources; + UnownedPtr<CPDF_Dictionary> m_pResources; + UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder; + UnownedPtr<std::set<const uint8_t*>> 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<CPDF_AllStates> m_pCurStates; CPDF_ContentMark m_CurContentMark; std::vector<std::unique_ptr<CPDF_TextObject>> m_ClipTextList; - CFX_UnownedPtr<CPDF_TextObject> m_pLastTextObject; + UnownedPtr<CPDF_TextObject> m_pLastTextObject; float m_DefFontSize; std::vector<FX_PATHPOINT> 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<CPDF_Document> m_pDocument; + UnownedPtr<CPDF_Document> m_pDocument; float m_FontSize; float m_CharSpace; float m_WordSpace; diff --git a/core/fpdfapi/parser/cfdf_document.h b/core/fpdfapi/parser/cfdf_document.h index 9065621ea7..743c5c0eaa 100644 --- a/core/fpdfapi/parser/cfdf_document.h +++ b/core/fpdfapi/parser/cfdf_document.h @@ -11,7 +11,7 @@ #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_object.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class IFX_SeekableReadStream; @@ -33,7 +33,7 @@ class CFDF_Document : public CPDF_IndirectObjectHolder { protected: void ParseStream(const RetainPtr<IFX_SeekableReadStream>& pFile); - CFX_UnownedPtr<CPDF_Dictionary> m_pRootDict; + UnownedPtr<CPDF_Dictionary> m_pRootDict; RetainPtr<IFX_SeekableReadStream> m_pFile; }; diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp index 5dd6285526..98afd450d7 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/parser/cpdf_data_avail.cpp @@ -65,7 +65,7 @@ class HintsScope { ~HintsScope() { validator_->SetDownloadHints(nullptr); } private: - CFX_UnownedPtr<CPDF_ReadValidator> validator_; + UnownedPtr<CPDF_ReadValidator> validator_; }; } // namespace diff --git a/core/fpdfapi/parser/cpdf_data_avail.h b/core/fpdfapi/parser/cpdf_data_avail.h index f48abb5be0..ab7f045fec 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.h +++ b/core/fpdfapi/parser/cpdf_data_avail.h @@ -13,7 +13,7 @@ #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_HintTables; @@ -185,7 +185,7 @@ class CPDF_DataAvail final { uint32_t m_dwRootObjNum; uint32_t m_dwInfoObjNum; std::unique_ptr<CPDF_LinearizedHeader> m_pLinearized; - CFX_UnownedPtr<CPDF_Object> m_pTrailer; + UnownedPtr<CPDF_Object> m_pTrailer; bool m_bDocAvail; FX_FILESIZE m_dwHeaderOffset; FX_FILESIZE m_dwLastXRefOffset; diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index 1b985dd7e1..c087254286 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -137,7 +137,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { // TODO(tsepez): figure out why tests break if this is an UnownedPtr. CPDF_Dictionary* m_pRootDict; // Not owned. - CFX_UnownedPtr<CPDF_Dictionary> m_pInfoDict; + UnownedPtr<CPDF_Dictionary> m_pInfoDict; // Vector of pairs to know current position in the page tree. The index in the // vector corresponds to the level being described. The pair contains a diff --git a/core/fpdfapi/parser/cpdf_hint_tables.h b/core/fpdfapi/parser/cpdf_hint_tables.h index e9647b1796..9658be5462 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.h +++ b/core/fpdfapi/parser/cpdf_hint_tables.h @@ -10,8 +10,8 @@ #include <vector> #include "core/fpdfapi/parser/cpdf_data_avail.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_stream.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_BitStream; class CPDF_LinearizedHeader; @@ -49,10 +49,10 @@ class CPDF_HintTables { const std::vector<FX_FILESIZE>& szArray); // Owner, outlives this object. - CFX_UnownedPtr<CPDF_DataAvail> const m_pDataAvail; + UnownedPtr<CPDF_DataAvail> const m_pDataAvail; // Owned by |m_pDataAvail|. - CFX_UnownedPtr<CPDF_LinearizedHeader> const m_pLinearized; + UnownedPtr<CPDF_LinearizedHeader> const m_pLinearized; uint32_t m_nFirstPageSharedObjs; FX_FILESIZE m_szFirstPageObjOffset; diff --git a/core/fpdfapi/parser/cpdf_object_avail.h b/core/fpdfapi/parser/cpdf_object_avail.h index bd46cdba5c..040cec7252 100644 --- a/core/fpdfapi/parser/cpdf_object_avail.h +++ b/core/fpdfapi/parser/cpdf_object_avail.h @@ -10,8 +10,8 @@ #include <stack> #include "core/fpdfapi/parser/cpdf_data_avail.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/maybe_owned.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Object; class CPDF_Reference; @@ -42,8 +42,8 @@ class CPDF_ObjectAvail { void CleanMemory(); bool HasObjectParsed(uint32_t obj_num) const; - CFX_UnownedPtr<CPDF_ReadValidator> validator_; - CFX_UnownedPtr<CPDF_IndirectObjectHolder> holder_; + UnownedPtr<CPDF_ReadValidator> validator_; + UnownedPtr<CPDF_IndirectObjectHolder> holder_; MaybeOwned<const CPDF_Object> root_; std::set<uint32_t> parsed_objnums_; std::stack<uint32_t> non_parsed_objects_; diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp index 770c718431..4b16021069 100644 --- a/core/fpdfapi/parser/cpdf_object_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp @@ -177,9 +177,9 @@ class PDFObjectsTest : public testing::Test { std::vector<std::unique_ptr<CPDF_Object>> m_DirectObjs; std::vector<int> m_DirectObjTypes; std::vector<std::unique_ptr<CPDF_Object>> m_RefObjs; - CFX_UnownedPtr<CPDF_Dictionary> m_DictObj; - CFX_UnownedPtr<CPDF_Dictionary> m_StreamDictObj; - CFX_UnownedPtr<CPDF_Array> m_ArrayObj; + UnownedPtr<CPDF_Dictionary> m_DictObj; + UnownedPtr<CPDF_Dictionary> m_StreamDictObj; + UnownedPtr<CPDF_Array> m_ArrayObj; std::vector<CPDF_Object*> m_IndirectObjs; }; diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h index f59691fe36..fe3fe1084f 100644 --- a/core/fpdfapi/parser/cpdf_parser.h +++ b/core/fpdfapi/parser/cpdf_parser.h @@ -14,10 +14,10 @@ #include <vector> #include "core/fpdfapi/parser/cpdf_syntax_parser.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Array; class CPDF_CryptoHandler; @@ -191,11 +191,11 @@ class CPDF_Parser { bool InitSyntaxParser(const RetainPtr<IFX_SeekableReadStream>& file_access); bool ParseFileVersion(); - CFX_UnownedPtr<CPDF_Document> m_pDocument; + UnownedPtr<CPDF_Document> m_pDocument; bool m_bHasParsed; bool m_bXRefStream; int m_FileVersion; - CFX_UnownedPtr<CPDF_Dictionary> m_pEncryptDict; + UnownedPtr<CPDF_Dictionary> m_pEncryptDict; FX_FILESIZE m_LastXRefOffset; std::unique_ptr<CPDF_SecurityHandler> m_pSecurityHandler; ByteString m_Password; diff --git a/core/fpdfapi/parser/cpdf_read_validator.h b/core/fpdfapi/parser/cpdf_read_validator.h index 812a5ccb1b..0bbf6ab924 100644 --- a/core/fpdfapi/parser/cpdf_read_validator.h +++ b/core/fpdfapi/parser/cpdf_read_validator.h @@ -19,7 +19,7 @@ class CPDF_ReadValidator : public IFX_SeekableReadStream { ~Session(); private: - CFX_UnownedPtr<CPDF_ReadValidator> validator_; + UnownedPtr<CPDF_ReadValidator> validator_; bool saved_read_error_; bool saved_has_unavailable_data_; }; @@ -56,9 +56,9 @@ class CPDF_ReadValidator : public IFX_SeekableReadStream { void ScheduleDownload(FX_FILESIZE offset, size_t size); RetainPtr<IFX_SeekableReadStream> file_read_; - CFX_UnownedPtr<CPDF_DataAvail::FileAvail> file_avail_; + UnownedPtr<CPDF_DataAvail::FileAvail> file_avail_; - CFX_UnownedPtr<CPDF_DataAvail::DownloadHints> hints_; + UnownedPtr<CPDF_DataAvail::DownloadHints> hints_; bool read_error_; bool has_unavailable_data_; diff --git a/core/fpdfapi/parser/cpdf_reference.h b/core/fpdfapi/parser/cpdf_reference.h index f564ab5b9b..b472b4a3ac 100644 --- a/core/fpdfapi/parser/cpdf_reference.h +++ b/core/fpdfapi/parser/cpdf_reference.h @@ -11,7 +11,7 @@ #include <set> #include "core/fpdfapi/parser/cpdf_object.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_IndirectObjectHolder; @@ -43,7 +43,7 @@ class CPDF_Reference : public CPDF_Object { std::set<const CPDF_Object*>* pVisited) const override; CPDF_Object* SafeGetDirect() const; - CFX_UnownedPtr<CPDF_IndirectObjectHolder> m_pObjList; + UnownedPtr<CPDF_IndirectObjectHolder> m_pObjList; uint32_t m_RefObjNum; }; diff --git a/core/fpdfapi/parser/cpdf_security_handler.h b/core/fpdfapi/parser/cpdf_security_handler.h index eb7d13f2e6..656aba0058 100644 --- a/core/fpdfapi/parser/cpdf_security_handler.h +++ b/core/fpdfapi/parser/cpdf_security_handler.h @@ -97,8 +97,8 @@ class CPDF_SecurityHandler { int m_Version; int m_Revision; - CFX_UnownedPtr<CPDF_Parser> m_pParser; - CFX_UnownedPtr<CPDF_Dictionary> m_pEncryptDict; + UnownedPtr<CPDF_Parser> m_pParser; + UnownedPtr<CPDF_Dictionary> m_pEncryptDict; uint32_t m_Permissions; int m_Cipher; uint8_t m_EncryptKey[32]; diff --git a/core/fpdfapi/parser/cpdf_stream_acc.h b/core/fpdfapi/parser/cpdf_stream_acc.h index a6cca095a6..a8a2540880 100644 --- a/core/fpdfapi/parser/cpdf_stream_acc.h +++ b/core/fpdfapi/parser/cpdf_stream_acc.h @@ -47,7 +47,7 @@ class CPDF_StreamAcc : public Retainable { bool m_bNewBuf; ByteString m_ImageDecoder; CPDF_Dictionary* m_pImageParam; - CFX_UnownedPtr<const CPDF_Stream> const m_pStream; + UnownedPtr<const CPDF_Stream> const m_pStream; uint8_t* m_pSrcData; }; diff --git a/core/fpdfapi/render/cpdf_devicebuffer.h b/core/fpdfapi/render/cpdf_devicebuffer.h index 2146c9761f..854906e03c 100644 --- a/core/fpdfapi/render/cpdf_devicebuffer.h +++ b/core/fpdfapi/render/cpdf_devicebuffer.h @@ -9,9 +9,9 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_DIBitmap; class CFX_RenderDevice; @@ -33,9 +33,9 @@ class CPDF_DeviceBuffer { const CFX_Matrix* GetMatrix() const { return &m_Matrix; } private: - CFX_UnownedPtr<CFX_RenderDevice> m_pDevice; - CFX_UnownedPtr<CPDF_RenderContext> m_pContext; - CFX_UnownedPtr<const CPDF_PageObject> m_pObject; + UnownedPtr<CFX_RenderDevice> m_pDevice; + UnownedPtr<CPDF_RenderContext> m_pContext; + UnownedPtr<const CPDF_PageObject> m_pObject; RetainPtr<CFX_DIBitmap> m_pBitmap; FX_RECT m_Rect; CFX_Matrix m_Matrix; diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h index 08c4afe862..dd7dd4fc02 100644 --- a/core/fpdfapi/render/cpdf_dibsource.h +++ b/core/fpdfapi/render/cpdf_dibsource.h @@ -18,8 +18,8 @@ #include "core/fpdfapi/render/cpdf_imageloader.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_renderdevice.h" @@ -122,9 +122,9 @@ class CPDF_DIBSource : public CFX_DIBSource { int clip_width) const; bool TransMask() const; - CFX_UnownedPtr<CPDF_Document> m_pDocument; - CFX_UnownedPtr<const CPDF_Stream> m_pStream; - CFX_UnownedPtr<const CPDF_Dictionary> m_pDict; + UnownedPtr<CPDF_Document> m_pDocument; + UnownedPtr<const CPDF_Stream> m_pStream; + UnownedPtr<const CPDF_Dictionary> m_pDict; RetainPtr<CPDF_StreamAcc> m_pStreamAcc; CPDF_ColorSpace* m_pColorSpace; uint32_t m_Family; @@ -148,7 +148,7 @@ class CPDF_DIBSource : public CFX_DIBSource { RetainPtr<CPDF_StreamAcc> m_pGlobalStream; std::unique_ptr<CCodec_ScanlineDecoder> m_pDecoder; std::unique_ptr<CCodec_Jbig2Context> m_pJbig2Context; - CFX_UnownedPtr<CPDF_Stream> m_pMaskStream; + UnownedPtr<CPDF_Stream> m_pMaskStream; int m_Status; }; diff --git a/core/fpdfapi/render/cpdf_docrenderdata.h b/core/fpdfapi/render/cpdf_docrenderdata.h index efc4741e5e..7b3e0ed398 100644 --- a/core/fpdfapi/render/cpdf_docrenderdata.h +++ b/core/fpdfapi/render/cpdf_docrenderdata.h @@ -11,8 +11,8 @@ #include "core/fpdfapi/page/cpdf_countedobject.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Document; class CPDF_Font; @@ -34,7 +34,7 @@ class CPDF_DocRenderData { void Clear(bool bRelease); private: - CFX_UnownedPtr<CPDF_Document> m_pPDFDoc; + UnownedPtr<CPDF_Document> m_pPDFDoc; std::map<CPDF_Font*, RetainPtr<CPDF_Type3Cache>> m_Type3FaceMap; std::map<CPDF_Object*, RetainPtr<CPDF_TransferFunc>> m_TransferFuncMap; }; diff --git a/core/fpdfapi/render/cpdf_imagecacheentry.h b/core/fpdfapi/render/cpdf_imagecacheentry.h index 111050f60c..2bede23e62 100644 --- a/core/fpdfapi/render/cpdf_imagecacheentry.h +++ b/core/fpdfapi/render/cpdf_imagecacheentry.h @@ -9,9 +9,9 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_DIBSource; class CFX_DIBitmap; @@ -48,7 +48,7 @@ class CPDF_ImageCacheEntry { void ContinueGetCachedBitmap(CPDF_RenderStatus* pRenderStatus); void CalcSize(); - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; RetainPtr<CPDF_Image> const m_pImage; RetainPtr<CFX_DIBSource> m_pCurBitmap; RetainPtr<CFX_DIBSource> m_pCurMask; diff --git a/core/fpdfapi/render/cpdf_imageloader.h b/core/fpdfapi/render/cpdf_imageloader.h index 2fc0670dff..497ef156da 100644 --- a/core/fpdfapi/render/cpdf_imageloader.h +++ b/core/fpdfapi/render/cpdf_imageloader.h @@ -9,8 +9,8 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CPDF_ImageObject; @@ -39,8 +39,8 @@ class CPDF_ImageLoader { private: void HandleFailure(); - CFX_UnownedPtr<CPDF_PageRenderCache> m_pCache; - CFX_UnownedPtr<CPDF_ImageObject> m_pImageObject; + UnownedPtr<CPDF_PageRenderCache> m_pCache; + UnownedPtr<CPDF_ImageObject> m_pImageObject; }; #endif // CORE_FPDFAPI_RENDER_CPDF_IMAGELOADER_H_ diff --git a/core/fpdfapi/render/cpdf_imagerenderer.h b/core/fpdfapi/render/cpdf_imagerenderer.h index 0d59a4e7cb..ba61ab4493 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.h +++ b/core/fpdfapi/render/cpdf_imagerenderer.h @@ -10,8 +10,8 @@ #include <memory> #include "core/fpdfapi/render/cpdf_imageloader.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_imagerenderer.h" class CFX_DIBitmap; @@ -63,17 +63,17 @@ class CPDF_ImageRenderer { const FX_RECT& rect) const; void HandleFilters(); - CFX_UnownedPtr<CPDF_RenderStatus> m_pRenderStatus; - CFX_UnownedPtr<CPDF_ImageObject> m_pImageObject; + UnownedPtr<CPDF_RenderStatus> m_pRenderStatus; + UnownedPtr<CPDF_ImageObject> m_pImageObject; int m_Status; - CFX_UnownedPtr<const CFX_Matrix> m_pObj2Device; + UnownedPtr<const CFX_Matrix> m_pObj2Device; CFX_Matrix m_ImageMatrix; CPDF_ImageLoader m_Loader; RetainPtr<CFX_DIBSource> m_pDIBSource; RetainPtr<CFX_DIBitmap> m_pClone; int m_BitmapAlpha; bool m_bPatternColor; - CFX_UnownedPtr<CPDF_Pattern> m_pPattern; + UnownedPtr<CPDF_Pattern> m_pPattern; FX_ARGB m_FillArgb; uint32_t m_Flags; std::unique_ptr<CFX_ImageTransformer> m_pTransformer; diff --git a/core/fpdfapi/render/cpdf_pagerendercache.h b/core/fpdfapi/render/cpdf_pagerendercache.h index 76898ab258..58f0bb7e32 100644 --- a/core/fpdfapi/render/cpdf_pagerendercache.h +++ b/core/fpdfapi/render/cpdf_pagerendercache.h @@ -9,9 +9,9 @@ #include <map> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_DIBitmap; class CPDF_Image; @@ -46,7 +46,7 @@ class CPDF_PageRenderCache { private: void ClearImageCacheEntry(CPDF_Stream* pStream); - CFX_UnownedPtr<CPDF_Page> const m_pPage; + UnownedPtr<CPDF_Page> const m_pPage; CPDF_ImageCacheEntry* m_pCurImageCacheEntry; std::map<CPDF_Stream*, CPDF_ImageCacheEntry*> m_ImageCache; uint32_t m_nTimeCount; diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.h b/core/fpdfapi/render/cpdf_progressiverenderer.h index 195636f168..ffd63a9aaf 100644 --- a/core/fpdfapi/render/cpdf_progressiverenderer.h +++ b/core/fpdfapi/render/cpdf_progressiverenderer.h @@ -47,8 +47,8 @@ class CPDF_ProgressiveRenderer { static const int kStepLimit = 100; Status m_Status; - CFX_UnownedPtr<CPDF_RenderContext> const m_pContext; - CFX_UnownedPtr<CFX_RenderDevice> const m_pDevice; + UnownedPtr<CPDF_RenderContext> const m_pContext; + UnownedPtr<CFX_RenderDevice> const m_pDevice; const CPDF_RenderOptions* const m_pOptions; std::unique_ptr<CPDF_RenderStatus> m_pRenderStatus; CFX_FloatRect m_ClipRect; diff --git a/core/fpdfapi/render/cpdf_rendercontext.h b/core/fpdfapi/render/cpdf_rendercontext.h index 8806a78622..606e5b9b68 100644 --- a/core/fpdfapi/render/cpdf_rendercontext.h +++ b/core/fpdfapi/render/cpdf_rendercontext.h @@ -9,9 +9,9 @@ #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_Document; @@ -32,7 +32,7 @@ class CPDF_RenderContext { Layer(const Layer& that); ~Layer(); - CFX_UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder; + UnownedPtr<CPDF_PageObjectHolder> m_pObjectHolder; CFX_Matrix m_Matrix; }; @@ -65,9 +65,9 @@ class CPDF_RenderContext { CPDF_PageRenderCache* GetPageCache() const { return m_pPageCache.Get(); } protected: - CFX_UnownedPtr<CPDF_Document> const m_pDocument; - CFX_UnownedPtr<CPDF_Dictionary> m_pPageResources; - CFX_UnownedPtr<CPDF_PageRenderCache> m_pPageCache; + UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Dictionary> m_pPageResources; + UnownedPtr<CPDF_PageRenderCache> m_pPageCache; std::vector<Layer> m_Layers; }; diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index e94913d9aa..8cc91e470d 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -87,7 +87,7 @@ class CPDF_RefType3Cache { } uint32_t m_dwCount; - CFX_UnownedPtr<CPDF_Type3Font> const m_pType3Font; + UnownedPtr<CPDF_Type3Font> const m_pType3Font; }; uint32_t CountOutputs( diff --git a/core/fpdfapi/render/cpdf_renderstatus.h b/core/fpdfapi/render/cpdf_renderstatus.h index b823834e7d..def3702e68 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.h +++ b/core/fpdfapi/render/cpdf_renderstatus.h @@ -13,7 +13,7 @@ #include "core/fpdfapi/page/cpdf_clippath.h" #include "core/fpdfapi/page/cpdf_graphicstates.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_renderdevice.h" class CFX_PathData; @@ -71,8 +71,8 @@ class CPDF_RenderStatus { #endif CPDF_RenderOptions m_Options; - CFX_UnownedPtr<CPDF_Dictionary> m_pFormResource; - CFX_UnownedPtr<CPDF_Dictionary> m_pPageResource; + UnownedPtr<CPDF_Dictionary> m_pFormResource; + UnownedPtr<CPDF_Dictionary> m_pPageResource; std::vector<CPDF_Type3Font*> m_Type3FontCache; private: @@ -159,7 +159,7 @@ class CPDF_RenderStatus { static const int kRenderMaxRecursionDepth = 64; static int s_CurrentRecursionDepth; - CFX_UnownedPtr<CPDF_RenderContext> m_pContext; + UnownedPtr<CPDF_RenderContext> m_pContext; bool m_bStopped; CFX_RenderDevice* m_pDevice; CFX_Matrix m_DeviceMatrix; @@ -174,7 +174,7 @@ class CPDF_RenderStatus { bool m_bStdCS; uint32_t m_GroupFamily; bool m_bLoadMask; - CFX_UnownedPtr<CPDF_Type3Char> m_pType3Char; + UnownedPtr<CPDF_Type3Char> m_pType3Char; FX_ARGB m_T3FillColor; int m_curBlend; }; diff --git a/core/fpdfapi/render/cpdf_scaledrenderbuffer.h b/core/fpdfapi/render/cpdf_scaledrenderbuffer.h index 47ab5ad39f..b77e4b6309 100644 --- a/core/fpdfapi/render/cpdf_scaledrenderbuffer.h +++ b/core/fpdfapi/render/cpdf_scaledrenderbuffer.h @@ -9,8 +9,8 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_defaultrenderdevice.h" class CFX_RenderDevice; @@ -37,10 +37,10 @@ class CPDF_ScaledRenderBuffer { void OutputToDevice(); private: - CFX_UnownedPtr<CFX_RenderDevice> m_pDevice; - CFX_UnownedPtr<CPDF_RenderContext> m_pContext; + UnownedPtr<CFX_RenderDevice> m_pDevice; + UnownedPtr<CPDF_RenderContext> m_pContext; FX_RECT m_Rect; - CFX_UnownedPtr<const CPDF_PageObject> m_pObject; + UnownedPtr<const CPDF_PageObject> m_pObject; std::unique_ptr<CFX_DefaultRenderDevice> m_pBitmapDevice; CFX_Matrix m_Matrix; }; diff --git a/core/fpdfapi/render/cpdf_transferfunc.h b/core/fpdfapi/render/cpdf_transferfunc.h index 32811891ea..40f83ea9a9 100644 --- a/core/fpdfapi/render/cpdf_transferfunc.h +++ b/core/fpdfapi/render/cpdf_transferfunc.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_RENDER_CPDF_TRANSFERFUNC_H_ #define CORE_FPDFAPI_RENDER_CPDF_TRANSFERFUNC_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CPDF_Document; @@ -22,7 +22,7 @@ class CPDF_TransferFunc : public Retainable { FX_COLORREF TranslateColor(FX_COLORREF src) const; RetainPtr<CFX_DIBSource> TranslateImage(const RetainPtr<CFX_DIBSource>& pSrc); - CFX_UnownedPtr<CPDF_Document> const m_pPDFDoc; + UnownedPtr<CPDF_Document> const m_pPDFDoc; bool m_bIdentity; uint8_t m_Samples[256 * 3]; diff --git a/core/fpdfapi/render/cpdf_type3cache.h b/core/fpdfapi/render/cpdf_type3cache.h index fe681bbc99..7911785ab1 100644 --- a/core/fpdfapi/render/cpdf_type3cache.h +++ b/core/fpdfapi/render/cpdf_type3cache.h @@ -38,7 +38,7 @@ class CPDF_Type3Cache : public Retainable { float retinaScaleX, float retinaScaleY); - CFX_UnownedPtr<CPDF_Type3Font> const m_pFont; + UnownedPtr<CPDF_Type3Font> const m_pFont; std::map<ByteString, std::unique_ptr<CPDF_Type3Glyphs>> m_SizeMap; }; diff --git a/core/fpdfdoc/cpdf_aaction.h b/core/fpdfdoc/cpdf_aaction.h index bacf1790f8..bfc67e5124 100644 --- a/core/fpdfdoc/cpdf_aaction.h +++ b/core/fpdfdoc/cpdf_aaction.h @@ -48,7 +48,7 @@ class CPDF_AAction { CPDF_Dictionary* GetDict() const { return m_pDict.Get(); } private: - CFX_UnownedPtr<CPDF_Dictionary> const m_pDict; + UnownedPtr<CPDF_Dictionary> const m_pDict; }; #endif // CORE_FPDFDOC_CPDF_AACTION_H_ diff --git a/core/fpdfdoc/cpdf_action.h b/core/fpdfdoc/cpdf_action.h index b405f226a5..9b7f90d56b 100644 --- a/core/fpdfdoc/cpdf_action.h +++ b/core/fpdfdoc/cpdf_action.h @@ -55,7 +55,7 @@ class CPDF_Action { CPDF_Action GetSubAction(size_t iIndex) const; private: - CFX_UnownedPtr<CPDF_Dictionary> const m_pDict; + UnownedPtr<CPDF_Dictionary> const m_pDict; }; #endif // CORE_FPDFDOC_CPDF_ACTION_H_ diff --git a/core/fpdfdoc/cpdf_actionfields.h b/core/fpdfdoc/cpdf_actionfields.h index 71b42475a7..83c70f6375 100644 --- a/core/fpdfdoc/cpdf_actionfields.h +++ b/core/fpdfdoc/cpdf_actionfields.h @@ -11,7 +11,7 @@ #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Action; class CPDF_Object; @@ -26,7 +26,7 @@ class CPDF_ActionFields { CPDF_Object* GetField(size_t iIndex) const; private: - CFX_UnownedPtr<const CPDF_Action> const m_pAction; + UnownedPtr<const CPDF_Action> const m_pAction; }; #endif // CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_ diff --git a/core/fpdfdoc/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h index cb579bbd3d..ab38eff1d8 100644 --- a/core/fpdfdoc/cpdf_annot.h +++ b/core/fpdfdoc/cpdf_annot.h @@ -111,7 +111,7 @@ class CPDF_Annot { CFX_FloatRect RectForDrawing() const; MaybeOwned<CPDF_Dictionary> m_pAnnotDict; - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; CPDF_Annot::Subtype m_nSubtype; std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap; // |m_bOpenState| is only set for popup annotations. diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h index a2a1f91a33..b4b72bc167 100644 --- a/core/fpdfdoc/cpdf_apsettings.h +++ b/core/fpdfdoc/cpdf_apsettings.h @@ -8,9 +8,9 @@ #define CORE_FPDFDOC_CPDF_APSETTINGS_H_ #include "core/fpdfdoc/cpdf_iconfit.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" #include "core/fxge/fx_dib.h" class CPDF_Dictionary; @@ -71,7 +71,7 @@ class CPDF_ApSettings { WideString GetCaption(const ByteString& csEntry) const; CPDF_Stream* GetIcon(const ByteString& csEntry) const; - CFX_UnownedPtr<CPDF_Dictionary> const m_pDict; + UnownedPtr<CPDF_Dictionary> const m_pDict; }; #endif // CORE_FPDFDOC_CPDF_APSETTINGS_H_ diff --git a/core/fpdfdoc/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h index 88f47a9450..60c86dd7b0 100644 --- a/core/fpdfdoc/cpdf_bookmark.h +++ b/core/fpdfdoc/cpdf_bookmark.h @@ -9,8 +9,8 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_dest.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_Document; @@ -30,7 +30,7 @@ class CPDF_Bookmark { CPDF_Action GetAction() const; private: - CFX_UnownedPtr<CPDF_Dictionary> m_pDict; + UnownedPtr<CPDF_Dictionary> m_pDict; }; #endif // CORE_FPDFDOC_CPDF_BOOKMARK_H_ diff --git a/core/fpdfdoc/cpdf_bookmarktree.h b/core/fpdfdoc/cpdf_bookmarktree.h index a854d6f4b1..3729dfc737 100644 --- a/core/fpdfdoc/cpdf_bookmarktree.h +++ b/core/fpdfdoc/cpdf_bookmarktree.h @@ -8,7 +8,7 @@ #define CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_ #include "core/fpdfdoc/cpdf_bookmark.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Document; @@ -22,7 +22,7 @@ class CPDF_BookmarkTree { CPDF_Document* GetDocument() const { return m_pDocument.Get(); } private: - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; }; #endif // CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_ diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h index 23964d7400..2836ebb471 100644 --- a/core/fpdfdoc/cpdf_dest.h +++ b/core/fpdfdoc/cpdf_dest.h @@ -7,9 +7,9 @@ #ifndef CORE_FPDFDOC_CPDF_DEST_H_ #define CORE_FPDFDOC_CPDF_DEST_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" class CPDF_Document; class CPDF_Object; @@ -36,7 +36,7 @@ class CPDF_Dest { float* pZoom) const; private: - CFX_UnownedPtr<CPDF_Object> m_pObj; + UnownedPtr<CPDF_Object> m_pObj; }; #endif // CORE_FPDFDOC_CPDF_DEST_H_ diff --git a/core/fpdfdoc/cpdf_docjsactions.h b/core/fpdfdoc/cpdf_docjsactions.h index c2652d7f6d..39aafb8d50 100644 --- a/core/fpdfdoc/cpdf_docjsactions.h +++ b/core/fpdfdoc/cpdf_docjsactions.h @@ -8,8 +8,8 @@ #define CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_ #include "core/fpdfdoc/cpdf_action.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Document; @@ -25,7 +25,7 @@ class CPDF_DocJSActions { CPDF_Document* GetDocument() const { return m_pDocument.Get(); } private: - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; }; #endif // CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_ diff --git a/core/fpdfdoc/cpdf_filespec.h b/core/fpdfdoc/cpdf_filespec.h index 131dfbe7ca..b32207d273 100644 --- a/core/fpdfdoc/cpdf_filespec.h +++ b/core/fpdfdoc/cpdf_filespec.h @@ -7,10 +7,10 @@ #ifndef CORE_FPDFDOC_CPDF_FILESPEC_H_ #define CORE_FPDFDOC_CPDF_FILESPEC_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/cfx_weak_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/string_pool_template.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_Object; @@ -36,7 +36,7 @@ class CPDF_FileSpec { void SetFileName(const WideString& wsFileName); private: - CFX_UnownedPtr<CPDF_Object> const m_pObj; + UnownedPtr<CPDF_Object> const m_pObj; }; #endif // CORE_FPDFDOC_CPDF_FILESPEC_H_ diff --git a/core/fpdfdoc/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h index 4f686f44ab..37b3d255e2 100644 --- a/core/fpdfdoc/cpdf_formcontrol.h +++ b/core/fpdfdoc/cpdf_formcontrol.h @@ -128,8 +128,8 @@ class CPDF_FormControl { CPDF_ApSettings GetMK() const; CPDF_FormField* const m_pField; - CFX_UnownedPtr<CPDF_Dictionary> const m_pWidgetDict; - CFX_UnownedPtr<const CPDF_InterForm> const m_pForm; + UnownedPtr<CPDF_Dictionary> const m_pWidgetDict; + UnownedPtr<const CPDF_InterForm> const m_pForm; }; #endif // CORE_FPDFDOC_CPDF_FORMCONTROL_H_ diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h index 6b4b7253e0..db1c514969 100644 --- a/core/fpdfdoc/cpdf_formfield.h +++ b/core/fpdfdoc/cpdf_formfield.h @@ -13,9 +13,9 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_formfield.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" #include "third_party/base/stl_util.h" #define FIELDTYPE_UNKNOWN 0 @@ -168,12 +168,12 @@ class CPDF_FormField { CPDF_FormField::Type m_Type; uint32_t m_Flags; - CFX_UnownedPtr<CPDF_InterForm> const m_pForm; - CFX_UnownedPtr<CPDF_Dictionary> m_pDict; + UnownedPtr<CPDF_InterForm> const m_pForm; + UnownedPtr<CPDF_Dictionary> m_pDict; // Owned by InterForm parent. - std::vector<CFX_UnownedPtr<CPDF_FormControl>> m_ControlList; + std::vector<UnownedPtr<CPDF_FormControl>> m_ControlList; float m_FontSize; - CFX_UnownedPtr<CPDF_Font> m_pFont; + UnownedPtr<CPDF_Font> m_pFont; }; #endif // CORE_FPDFDOC_CPDF_FORMFIELD_H_ diff --git a/core/fpdfdoc/cpdf_iconfit.h b/core/fpdfdoc/cpdf_iconfit.h index 0fa8d37e24..e6aafb62e1 100644 --- a/core/fpdfdoc/cpdf_iconfit.h +++ b/core/fpdfdoc/cpdf_iconfit.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFDOC_CPDF_ICONFIT_H_ #define CORE_FPDFDOC_CPDF_ICONFIT_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; @@ -27,7 +27,7 @@ class CPDF_IconFit { const CPDF_Dictionary* GetDict() const { return m_pDict.Get(); } private: - CFX_UnownedPtr<const CPDF_Dictionary> const m_pDict; + UnownedPtr<const CPDF_Dictionary> const m_pDict; }; #endif // CORE_FPDFDOC_CPDF_ICONFIT_H_ diff --git a/core/fpdfdoc/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h index d3796e5752..576c2ccc39 100644 --- a/core/fpdfdoc/cpdf_interform.h +++ b/core/fpdfdoc/cpdf_interform.h @@ -13,9 +13,9 @@ #include "core/fpdfapi/parser/fpdf_parser_decode.h" #include "core/fpdfdoc/cpdf_defaultappearance.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" class CFieldTree; class CFDF_Document; @@ -108,13 +108,13 @@ class CPDF_InterForm { static bool s_bUpdateAP; - CFX_UnownedPtr<CPDF_Document> const m_pDocument; - CFX_UnownedPtr<CPDF_Dictionary> m_pFormDict; + UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Dictionary> m_pFormDict; std::map<const CPDF_Dictionary*, std::unique_ptr<CPDF_FormControl>> m_ControlMap; std::unique_ptr<CFieldTree> m_pFieldTree; ByteString m_bsEncoding; - CFX_UnownedPtr<IPDF_FormNotify> m_pFormNotify; + UnownedPtr<IPDF_FormNotify> m_pFormNotify; }; #endif // CORE_FPDFDOC_CPDF_INTERFORM_H_ diff --git a/core/fpdfdoc/cpdf_link.h b/core/fpdfdoc/cpdf_link.h index 82f50fe004..18200cc637 100644 --- a/core/fpdfdoc/cpdf_link.h +++ b/core/fpdfdoc/cpdf_link.h @@ -9,8 +9,8 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_dest.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; @@ -27,7 +27,7 @@ class CPDF_Link { CPDF_Action GetAction(); private: - CFX_UnownedPtr<CPDF_Dictionary> m_pDict; + UnownedPtr<CPDF_Dictionary> m_pDict; }; #endif // CORE_FPDFDOC_CPDF_LINK_H_ diff --git a/core/fpdfdoc/cpdf_nametree.h b/core/fpdfdoc/cpdf_nametree.h index add62f1767..72d0d669e9 100644 --- a/core/fpdfdoc/cpdf_nametree.h +++ b/core/fpdfdoc/cpdf_nametree.h @@ -9,8 +9,8 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Array; class CPDF_Dictionary; @@ -36,7 +36,7 @@ class CPDF_NameTree { CPDF_Dictionary* GetRoot() const { return m_pRoot.Get(); } private: - CFX_UnownedPtr<CPDF_Dictionary> m_pRoot; + UnownedPtr<CPDF_Dictionary> m_pRoot; }; #endif // CORE_FPDFDOC_CPDF_NAMETREE_H_ diff --git a/core/fpdfdoc/cpdf_numbertree.h b/core/fpdfdoc/cpdf_numbertree.h index 843e186208..47c40b93d3 100644 --- a/core/fpdfdoc/cpdf_numbertree.h +++ b/core/fpdfdoc/cpdf_numbertree.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFDOC_CPDF_NUMBERTREE_H_ #define CORE_FPDFDOC_CPDF_NUMBERTREE_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_Object; @@ -20,7 +20,7 @@ class CPDF_NumberTree { CPDF_Object* LookupValue(int num) const; protected: - CFX_UnownedPtr<CPDF_Dictionary> const m_pRoot; + UnownedPtr<CPDF_Dictionary> const m_pRoot; }; #endif // CORE_FPDFDOC_CPDF_NUMBERTREE_H_ diff --git a/core/fpdfdoc/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h index c4fbb25724..07b41cc552 100644 --- a/core/fpdfdoc/cpdf_occontext.h +++ b/core/fpdfdoc/cpdf_occontext.h @@ -38,7 +38,7 @@ class CPDF_OCContext : public Retainable { bool GetOCGVE(CPDF_Array* pExpression, int nLevel); bool LoadOCMDState(const CPDF_Dictionary* pOCMDDict); - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; const UsageType m_eUsageType; std::map<const CPDF_Dictionary*, bool> m_OCGStates; }; diff --git a/core/fpdfdoc/cpdf_pagelabel.h b/core/fpdfdoc/cpdf_pagelabel.h index 1b21ca8bdb..8a7a33d16a 100644 --- a/core/fpdfdoc/cpdf_pagelabel.h +++ b/core/fpdfdoc/cpdf_pagelabel.h @@ -21,7 +21,7 @@ class CPDF_PageLabel { int32_t GetPageByLabel(const WideStringView& wsLabel) const; private: - CFX_UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Document> const m_pDocument; }; #endif // CORE_FPDFDOC_CPDF_PAGELABEL_H_ diff --git a/core/fpdfdoc/cpdf_structelement.h b/core/fpdfdoc/cpdf_structelement.h index c1e5f5001d..57f8aee2e8 100644 --- a/core/fpdfdoc/cpdf_structelement.h +++ b/core/fpdfdoc/cpdf_structelement.h @@ -9,9 +9,9 @@ #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CPDF_Dictionary; @@ -28,7 +28,7 @@ class CPDF_StructKid { enum { Invalid, Element, PageContent, StreamContent, Object } m_Type; RetainPtr<CPDF_StructElement> m_pElement; // For Element. - CFX_UnownedPtr<CPDF_Dictionary> m_pDict; // For Element. + UnownedPtr<CPDF_Dictionary> m_pDict; // For Element. uint32_t m_PageObjNum; // For PageContent, StreamContent, Object. uint32_t m_RefObjNum; // For StreamContent, Object. uint32_t m_ContentId; // For PageContent, StreamContent. @@ -56,9 +56,9 @@ class CPDF_StructElement : public Retainable { void LoadKids(CPDF_Dictionary* pDict); void LoadKid(uint32_t PageObjNum, CPDF_Object* pObj, CPDF_StructKid* pKid); - CFX_UnownedPtr<CPDF_StructTree> const m_pTree; - CFX_UnownedPtr<CPDF_StructElement> const m_pParent; - CFX_UnownedPtr<CPDF_Dictionary> const m_pDict; + UnownedPtr<CPDF_StructTree> const m_pTree; + UnownedPtr<CPDF_StructElement> const m_pParent; + UnownedPtr<CPDF_Dictionary> const m_pDict; ByteString m_Type; ByteString m_Title; std::vector<CPDF_StructKid> m_Kids; diff --git a/core/fpdfdoc/cpdf_structtree.h b/core/fpdfdoc/cpdf_structtree.h index 9603620fc1..9f1d50e066 100644 --- a/core/fpdfdoc/cpdf_structtree.h +++ b/core/fpdfdoc/cpdf_structtree.h @@ -11,8 +11,8 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Dictionary; class CPDF_Document; @@ -42,9 +42,9 @@ class CPDF_StructTree { bool AddTopLevelNode(CPDF_Dictionary* pDict, const RetainPtr<CPDF_StructElement>& pElement); - CFX_UnownedPtr<const CPDF_Dictionary> const m_pTreeRoot; - CFX_UnownedPtr<const CPDF_Dictionary> const m_pRoleMap; - CFX_UnownedPtr<const CPDF_Dictionary> m_pPage; + UnownedPtr<const CPDF_Dictionary> const m_pTreeRoot; + UnownedPtr<const CPDF_Dictionary> const m_pRoleMap; + UnownedPtr<const CPDF_Dictionary> m_pPage; std::vector<RetainPtr<CPDF_StructElement>> m_Kids; }; diff --git a/core/fpdfdoc/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h index 704408c5be..5b0c259952 100644 --- a/core/fpdfdoc/cpdf_variabletext.h +++ b/core/fpdfdoc/cpdf_variabletext.h @@ -58,7 +58,7 @@ class CPDF_VariableText { private: CPVT_WordPlace m_CurPos; - CFX_UnownedPtr<CPDF_VariableText> const m_pVT; + UnownedPtr<CPDF_VariableText> const m_pVT; }; class Provider { diff --git a/core/fpdfdoc/cpdf_viewerpreferences.h b/core/fpdfdoc/cpdf_viewerpreferences.h index bbe5d1a512..a1884748e4 100644 --- a/core/fpdfdoc/cpdf_viewerpreferences.h +++ b/core/fpdfdoc/cpdf_viewerpreferences.h @@ -7,9 +7,9 @@ #ifndef CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_ #define CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_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" class CPDF_Array; class CPDF_Dictionary; @@ -34,7 +34,7 @@ class CPDF_ViewerPreferences { private: CPDF_Dictionary* GetViewerPreferences() const; - CFX_UnownedPtr<CPDF_Document> const m_pDoc; + UnownedPtr<CPDF_Document> const m_pDoc; }; #endif // CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_ diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h index feca454774..a0b94cf25a 100644 --- a/core/fpdfdoc/cpvt_fontmap.h +++ b/core/fpdfdoc/cpvt_fontmap.h @@ -10,8 +10,8 @@ #include <stdint.h> #include "core/fpdfdoc/ipvt_fontmap.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Document; class CPDF_Dictionary; @@ -39,10 +39,10 @@ class CPVT_FontMap : public IPVT_FontMap { ByteString* sSysFontAlias); private: - CFX_UnownedPtr<CPDF_Document> const m_pDocument; - CFX_UnownedPtr<CPDF_Dictionary> const m_pResDict; - CFX_UnownedPtr<CPDF_Font> const m_pDefFont; - CFX_UnownedPtr<CPDF_Font> m_pSysFont; + UnownedPtr<CPDF_Document> const m_pDocument; + UnownedPtr<CPDF_Dictionary> const m_pResDict; + UnownedPtr<CPDF_Font> const m_pDefFont; + UnownedPtr<CPDF_Font> m_pSysFont; const ByteString m_sDefFontAlias; ByteString m_sSysFontAlias; }; diff --git a/core/fpdfdoc/csection.h b/core/fpdfdoc/csection.h index aefdcaf7b2..7c2b70b7dc 100644 --- a/core/fpdfdoc/csection.h +++ b/core/fpdfdoc/csection.h @@ -57,7 +57,7 @@ class CSection final { void ClearRightWords(int32_t nWordIndex); void ClearMidWords(int32_t nBeginIndex, int32_t nEndIndex); - CFX_UnownedPtr<CPDF_VariableText> const m_pVT; + UnownedPtr<CPDF_VariableText> const m_pVT; }; #endif // CORE_FPDFDOC_CSECTION_H_ diff --git a/core/fpdfdoc/ctypeset.h b/core/fpdfdoc/ctypeset.h index 6131467e56..3d56a3b092 100644 --- a/core/fpdfdoc/ctypeset.h +++ b/core/fpdfdoc/ctypeset.h @@ -8,8 +8,8 @@ #define CORE_FPDFDOC_CTYPESET_H_ #include "core/fpdfdoc/cpvt_floatrect.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_VariableText; class CSection; @@ -28,7 +28,7 @@ class CTypeset final { void OutputLines(); CPVT_FloatRect m_rcRet; - CFX_UnownedPtr<CPDF_VariableText> const m_pVT; + UnownedPtr<CPDF_VariableText> const m_pVT; CSection* const m_pSection; }; diff --git a/core/fpdftext/cpdf_linkextract.h b/core/fpdftext/cpdf_linkextract.h index db82deb684..713f658169 100644 --- a/core/fpdftext/cpdf_linkextract.h +++ b/core/fpdftext/cpdf_linkextract.h @@ -37,7 +37,7 @@ class CPDF_LinkExtract { WideString m_strUrl; }; - CFX_UnownedPtr<const CPDF_TextPage> const m_pTextPage; + UnownedPtr<const CPDF_TextPage> const m_pTextPage; WideString m_strPageText; std::vector<Link> m_LinkArray; }; diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h index ef55ad05cb..155f991a91 100644 --- a/core/fpdftext/cpdf_textpage.h +++ b/core/fpdftext/cpdf_textpage.h @@ -11,10 +11,10 @@ #include <vector> #include "core/fpdfapi/page/cpdf_pageobjectlist.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/cfx_widetextbuf.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDF_Font; class CPDF_FormObject; @@ -58,7 +58,7 @@ class FPDF_CHAR_INFO { float m_FontSize; CFX_PointF m_Origin; CFX_FloatRect m_CharBox; - CFX_UnownedPtr<CPDF_TextObject> m_pTextObj; + UnownedPtr<CPDF_TextObject> m_pTextObj; CFX_Matrix m_Matrix; }; @@ -79,7 +79,7 @@ class PAGECHAR_INFO { int32_t m_Flag; CFX_PointF m_Origin; CFX_FloatRect m_CharBox; - CFX_UnownedPtr<CPDF_TextObject> m_pTextObj; + UnownedPtr<CPDF_TextObject> m_pTextObj; CFX_Matrix m_Matrix; }; @@ -88,7 +88,7 @@ struct PDFTEXT_Obj { PDFTEXT_Obj(const PDFTEXT_Obj& that); ~PDFTEXT_Obj(); - CFX_UnownedPtr<CPDF_TextObject> m_pTextObj; + UnownedPtr<CPDF_TextObject> m_pTextObj; CFX_Matrix m_formMatrix; }; @@ -167,14 +167,14 @@ class CPDF_TextPage { const CPDF_Font* pFont, int nItems) const; - CFX_UnownedPtr<const CPDF_Page> const m_pPage; + UnownedPtr<const CPDF_Page> const m_pPage; std::vector<uint16_t> m_CharIndex; std::deque<PAGECHAR_INFO> m_CharList; std::deque<PAGECHAR_INFO> m_TempCharList; CFX_WideTextBuf m_TextBuf; CFX_WideTextBuf m_TempTextBuf; const FPDFText_Direction m_parserflag; - CFX_UnownedPtr<CPDF_TextObject> m_pPreTextObj; + UnownedPtr<CPDF_TextObject> m_pPreTextObj; CFX_Matrix m_perMatrix; bool m_bIsParsed; CFX_Matrix m_DisplayMatrix; diff --git a/core/fpdftext/cpdf_textpagefind.h b/core/fpdftext/cpdf_textpagefind.h index f9a28a0b0a..face4e46b4 100644 --- a/core/fpdftext/cpdf_textpagefind.h +++ b/core/fpdftext/cpdf_textpagefind.h @@ -9,10 +9,10 @@ #include <vector> -#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" #include "third_party/base/optional.h" class CPDF_TextPage; @@ -43,7 +43,7 @@ class CPDF_TextPageFind { private: std::vector<uint16_t> m_CharIndex; - CFX_UnownedPtr<const CPDF_TextPage> m_pTextPage; + UnownedPtr<const CPDF_TextPage> m_pTextPage; WideString m_strText; WideString m_findWhat; int m_flags; diff --git a/core/fxcodec/codec/ccodec_bmpmodule.cpp b/core/fxcodec/codec/ccodec_bmpmodule.cpp index a64e6783e1..a76cc3c6f7 100644 --- a/core/fxcodec/codec/ccodec_bmpmodule.cpp +++ b/core/fxcodec/codec/ccodec_bmpmodule.cpp @@ -9,7 +9,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcodec/lbmp/fx_bmp.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxcodec/codec/ccodec_bmpmodule.h b/core/fxcodec/codec/ccodec_bmpmodule.h index e9ad7c3001..8a33f66eac 100644 --- a/core/fxcodec/codec/ccodec_bmpmodule.h +++ b/core/fxcodec/codec/ccodec_bmpmodule.h @@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_DIBAttribute; diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index ae70389ced..a08e72f86d 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -10,7 +10,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcodec/fx_codec.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" @@ -28,8 +28,8 @@ class CPngContext : public CCodec_PngModule::Context { png_structp m_pPng; png_infop m_pInfo; - CFX_UnownedPtr<CCodec_PngModule> m_pModule; - CFX_UnownedPtr<CCodec_PngModule::Delegate> m_pDelegate; + UnownedPtr<CCodec_PngModule> m_pModule; + UnownedPtr<CCodec_PngModule::Delegate> m_pDelegate; void* (*m_AllocFunc)(unsigned int); void (*m_FreeFunc)(void*); char m_szLastError[PNG_ERROR_SIZE]; diff --git a/core/fxcodec/codec/ccodec_progressivedecoder.h b/core/fxcodec/codec/ccodec_progressivedecoder.h index 3ce19402d2..87bed08fcf 100644 --- a/core/fxcodec/codec/ccodec_progressivedecoder.h +++ b/core/fxcodec/codec/ccodec_progressivedecoder.h @@ -16,9 +16,9 @@ #include "core/fxcodec/codec/ccodec_pngmodule.h" #include "core/fxcodec/codec/ccodec_tiffmodule.h" #include "core/fxcodec/fx_codec_def.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class CCodec_ModuleMgr; @@ -187,7 +187,7 @@ class CCodec_ProgressiveDecoder : public CCodec_BmpModule::Delegate, RetainPtr<IFX_SeekableReadStream> m_pFile; RetainPtr<CFX_DIBitmap> m_pDeviceBitmap; - CFX_UnownedPtr<CCodec_ModuleMgr> m_pCodecMgr; + UnownedPtr<CCodec_ModuleMgr> m_pCodecMgr; std::unique_ptr<CCodec_JpegModule::Context> m_pJpegContext; std::unique_ptr<CCodec_PngModule::Context> m_pPngContext; std::unique_ptr<CCodec_GifModule::Context> m_pGifContext; diff --git a/core/fxcodec/codec/cjpx_decoder.h b/core/fxcodec/codec/cjpx_decoder.h index 9e6c79cafc..c68969301c 100644 --- a/core/fxcodec/codec/cjpx_decoder.h +++ b/core/fxcodec/codec/cjpx_decoder.h @@ -11,7 +11,7 @@ #include <vector> #include "core/fxcodec/codec/codec_int.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "third_party/libopenjpeg20/openjpeg.h" class CPDF_ColorSpace; @@ -36,7 +36,7 @@ class CJPX_Decoder { std::unique_ptr<DecodeData> m_DecodeData; opj_stream_t* m_Stream; opj_dparameters_t m_Parameters; - CFX_UnownedPtr<const CPDF_ColorSpace> const m_ColorSpace; + UnownedPtr<const CPDF_ColorSpace> const m_ColorSpace; }; #endif // CORE_FXCODEC_CODEC_CJPX_DECODER_H_ diff --git a/core/fxcodec/jbig2/JBig2_ArithDecoder.h b/core/fxcodec/jbig2/JBig2_ArithDecoder.h index 2ec64fe954..d4a2daedbc 100644 --- a/core/fxcodec/jbig2/JBig2_ArithDecoder.h +++ b/core/fxcodec/jbig2/JBig2_ArithDecoder.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CJBig2_BitStream; @@ -39,7 +39,7 @@ class CJBig2_ArithDecoder { unsigned int m_C; unsigned int m_A; unsigned int m_CT; - CFX_UnownedPtr<CJBig2_BitStream> const m_pStream; + UnownedPtr<CJBig2_BitStream> const m_pStream; }; #endif // CORE_FXCODEC_JBIG2_JBIG2_ARITHDECODER_H_ diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h index 14c57f976a..79992adcba 100644 --- a/core/fxcodec/jbig2/JBig2_GrdProc.h +++ b/core/fxcodec/jbig2/JBig2_GrdProc.h @@ -10,9 +10,9 @@ #include <memory> #include "core/fxcodec/fx_codec_def.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 CJBig2_ArithDecoder; class CJBig2_BitStream; diff --git a/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h index 15ebf7827d..ac53b4d9c0 100644 --- a/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h +++ b/core/fxcodec/jbig2/JBig2_HuffmanDecoder.h @@ -9,7 +9,7 @@ #include "core/fxcodec/jbig2/JBig2_BitStream.h" #include "core/fxcodec/jbig2/JBig2_HuffmanTable.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CJBig2_HuffmanDecoder { public: @@ -20,7 +20,7 @@ class CJBig2_HuffmanDecoder { int decodeAValue(CJBig2_HuffmanTable* pTable, int* nResult); private: - CFX_UnownedPtr<CJBig2_BitStream> const m_pStream; + UnownedPtr<CJBig2_BitStream> const m_pStream; }; #endif // CORE_FXCODEC_JBIG2_JBIG2_HUFFMANDECODER_H_ diff --git a/core/fxcodec/lbmp/fx_bmp.h b/core/fxcodec/lbmp/fx_bmp.h index 3876aed407..72dbfa5b03 100644 --- a/core/fxcodec/lbmp/fx_bmp.h +++ b/core/fxcodec/lbmp/fx_bmp.h @@ -134,8 +134,8 @@ class CBmpContext : public CCodec_BmpModule::Context { ~CBmpContext() override; BMPDecompressor m_Bmp; - CFX_UnownedPtr<CCodec_BmpModule> const m_pModule; - CFX_UnownedPtr<CCodec_BmpModule::Delegate> const m_pDelegate; + UnownedPtr<CCodec_BmpModule> const m_pModule; + UnownedPtr<CCodec_BmpModule::Delegate> const m_pDelegate; char m_szLastError[256]; }; diff --git a/core/fxcodec/lgif/cgifcontext.h b/core/fxcodec/lgif/cgifcontext.h index 03976a7aad..d85243711d 100644 --- a/core/fxcodec/lgif/cgifcontext.h +++ b/core/fxcodec/lgif/cgifcontext.h @@ -12,8 +12,8 @@ #include "core/fxcodec/codec/ccodec_gifmodule.h" #include "core/fxcodec/lgif/fx_gif.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CGifContext : public CCodec_GifModule::Context { public: @@ -37,8 +37,8 @@ class CGifContext : public CCodec_GifModule::Context { int32_t disposal_method, bool interlace); - CFX_UnownedPtr<CCodec_GifModule> m_pModule; - CFX_UnownedPtr<CCodec_GifModule::Delegate> m_pDelegate; + UnownedPtr<CCodec_GifModule> m_pModule; + UnownedPtr<CCodec_GifModule::Delegate> m_pDelegate; std::vector<GifPalette> m_GlobalPalette; int32_t global_pal_num; uint32_t img_row_offset; diff --git a/core/fxcrt/cfx_bitstream.h b/core/fxcrt/cfx_bitstream.h index 1829f23b92..168760ddd8 100644 --- a/core/fxcrt/cfx_bitstream.h +++ b/core/fxcrt/cfx_bitstream.h @@ -9,7 +9,7 @@ #include <stdint.h> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_BitStream { public: @@ -32,7 +32,7 @@ class CFX_BitStream { private: uint32_t m_BitPos; uint32_t m_BitSize; - CFX_UnownedPtr<const uint8_t> m_pData; + UnownedPtr<const uint8_t> m_pData; }; #endif // CORE_FXCRT_CFX_BITSTREAM_H_ diff --git a/core/fxcrt/string_view_template.h b/core/fxcrt/string_view_template.h index 21426acaeb..31c2c1e2af 100644 --- a/core/fxcrt/string_view_template.h +++ b/core/fxcrt/string_view_template.h @@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" #include "third_party/base/optional.h" #include "third_party/base/stl_util.h" @@ -216,7 +216,7 @@ class StringViewTemplate { } protected: - CFX_UnownedPtr<const UnsignedType> m_Ptr; + UnownedPtr<const UnsignedType> m_Ptr; FX_STRSIZE m_Length; private: diff --git a/core/fxcrt/cfx_unowned_ptr.h b/core/fxcrt/unowned_ptr.h index 5376781d6a..012af3ddf7 100644 --- a/core/fxcrt/cfx_unowned_ptr.h +++ b/core/fxcrt/unowned_ptr.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CORE_FXCRT_CFX_UNOWNED_PTR_H_ -#define CORE_FXCRT_CFX_UNOWNED_PTR_H_ +#ifndef CORE_FXCRT_UNOWNED_PTR_H_ +#define CORE_FXCRT_UNOWNED_PTR_H_ #include <functional> #include <memory> #include <type_traits> #include <utility> -// CFX_UnownedPtr is a smart pointer class that behaves very much like a +// UnownedPtr is a smart pointer class that behaves very much like a // standard C-style pointer. The advantages of using it over raw // pointers are: // @@ -34,39 +34,39 @@ // because an unowned ptr expresses a one to one relationship with some // other heap object. +namespace fxcrt { + template <class T> -class CFX_UnownedPtr { +class UnownedPtr { public: - CFX_UnownedPtr() {} - CFX_UnownedPtr(const CFX_UnownedPtr& that) : CFX_UnownedPtr(that.Get()) {} + UnownedPtr() {} + UnownedPtr(const UnownedPtr& that) : UnownedPtr(that.Get()) {} template <typename U> - explicit CFX_UnownedPtr(U* pObj) : m_pObj(pObj) {} + explicit UnownedPtr(U* pObj) : m_pObj(pObj) {} // Deliberately implicit to allow returning nullptrs. // NOLINTNEXTLINE(runtime/explicit) - CFX_UnownedPtr(std::nullptr_t ptr) {} + UnownedPtr(std::nullptr_t ptr) {} - ~CFX_UnownedPtr() { ProbeForLowSeverityLifetimeIssue(); } + ~UnownedPtr() { ProbeForLowSeverityLifetimeIssue(); } - CFX_UnownedPtr& operator=(T* that) { + UnownedPtr& operator=(T* that) { ProbeForLowSeverityLifetimeIssue(); m_pObj = that; return *this; } - CFX_UnownedPtr& operator=(const CFX_UnownedPtr& that) { + UnownedPtr& operator=(const UnownedPtr& that) { ProbeForLowSeverityLifetimeIssue(); if (*this != that) m_pObj = that.Get(); return *this; } - bool operator==(const CFX_UnownedPtr& that) const { - return Get() == that.Get(); - } - bool operator!=(const CFX_UnownedPtr& that) const { return !(*this == that); } - bool operator<(const CFX_UnownedPtr& that) const { + bool operator==(const UnownedPtr& that) const { return Get() == that.Get(); } + bool operator!=(const UnownedPtr& that) const { return !(*this == that); } + bool operator<(const UnownedPtr& that) const { return std::less<T*>()(Get(), that.Get()); } @@ -105,13 +105,17 @@ class CFX_UnownedPtr { }; template <typename T, typename U> -inline bool operator==(const U* lhs, const CFX_UnownedPtr<T>& rhs) { +inline bool operator==(const U* lhs, const UnownedPtr<T>& rhs) { return rhs == lhs; } template <typename T, typename U> -inline bool operator!=(const U* lhs, const CFX_UnownedPtr<T>& rhs) { +inline bool operator!=(const U* lhs, const UnownedPtr<T>& rhs) { return rhs != lhs; } -#endif // CORE_FXCRT_CFX_UNOWNED_PTR_H_ +} // namespace fxcrt + +using fxcrt::UnownedPtr; + +#endif // CORE_FXCRT_UNOWNED_PTR_H_ diff --git a/core/fxcrt/cfx_unowned_ptr_unittest.cpp b/core/fxcrt/unowned_ptr_unittest.cpp index 46230e7ebd..3fc5308e46 100644 --- a/core/fxcrt/cfx_unowned_ptr_unittest.cpp +++ b/core/fxcrt/unowned_ptr_unittest.cpp @@ -2,18 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include <utility> #include <vector> #include "testing/gtest/include/gtest/gtest.h" +namespace fxcrt { namespace { class Clink { public: - CFX_UnownedPtr<Clink> next_ = nullptr; + UnownedPtr<Clink> next_ = nullptr; }; void DeleteDangling() { @@ -44,7 +45,7 @@ void ReleaseDangling() { } // namespace -TEST(fxcrt, UnownedPtrOk) { +TEST(UnownedPtr, PtrOk) { Clink* ptr1 = new Clink(); Clink* ptr2 = new Clink(); ptr2->next_ = ptr1; @@ -52,7 +53,7 @@ TEST(fxcrt, UnownedPtrOk) { delete ptr1; } -TEST(fxcrt, UnownedPtrNotOk) { +TEST(UnownedPtr, PtrNotOk) { #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) EXPECT_DEATH(DeleteDangling(), ""); #else @@ -60,7 +61,7 @@ TEST(fxcrt, UnownedPtrNotOk) { #endif } -TEST(fxcrt, UnownedAssignOk) { +TEST(UnownedPtr, AssignOk) { Clink* ptr1 = new Clink(); Clink* ptr2 = new Clink(); ptr2->next_ = ptr1; @@ -69,7 +70,7 @@ TEST(fxcrt, UnownedAssignOk) { delete ptr1; } -TEST(fxcrt, UnownedAssignNotOk) { +TEST(UnownedPtr, AssignNotOk) { #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) EXPECT_DEATH(AssignDangling(), ""); #else @@ -77,7 +78,7 @@ TEST(fxcrt, UnownedAssignNotOk) { #endif } -TEST(fxcrt, UnownedReleaseOk) { +TEST(UnownedPtr, ReleaseOk) { Clink* ptr1 = new Clink(); Clink* ptr2 = new Clink(); ptr2->next_ = ptr1; @@ -86,7 +87,7 @@ TEST(fxcrt, UnownedReleaseOk) { delete ptr2; } -TEST(fxcrt, UnownedReleaseNotOk) { +TEST(UnownedPtr, ReleaseNotOk) { #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) EXPECT_DEATH(ReleaseDangling(), ""); #else @@ -94,15 +95,15 @@ TEST(fxcrt, UnownedReleaseNotOk) { #endif } -TEST(fxcrt, UnownedOperatorEQ) { +TEST(UnownedPtr, OperatorEQ) { int foo; - CFX_UnownedPtr<int> ptr1; + UnownedPtr<int> ptr1; EXPECT_TRUE(ptr1 == ptr1); - CFX_UnownedPtr<int> ptr2; + UnownedPtr<int> ptr2; EXPECT_TRUE(ptr1 == ptr2); - CFX_UnownedPtr<int> ptr3(&foo); + UnownedPtr<int> ptr3(&foo); EXPECT_TRUE(&foo == ptr3); EXPECT_TRUE(ptr3 == &foo); EXPECT_FALSE(ptr1 == ptr3); @@ -111,15 +112,15 @@ TEST(fxcrt, UnownedOperatorEQ) { EXPECT_TRUE(ptr1 == ptr3); } -TEST(fxcrt, UnownedOperatorNE) { +TEST(UnownedPtr, OperatorNE) { int foo; - CFX_UnownedPtr<int> ptr1; + UnownedPtr<int> ptr1; EXPECT_FALSE(ptr1 != ptr1); - CFX_UnownedPtr<int> ptr2; + UnownedPtr<int> ptr2; EXPECT_FALSE(ptr1 != ptr2); - CFX_UnownedPtr<int> ptr3(&foo); + UnownedPtr<int> ptr3(&foo); EXPECT_FALSE(&foo != ptr3); EXPECT_FALSE(ptr3 != &foo); EXPECT_TRUE(ptr1 != ptr3); @@ -128,12 +129,14 @@ TEST(fxcrt, UnownedOperatorNE) { EXPECT_FALSE(ptr1 != ptr3); } -TEST(fxcrt, UnownedOperatorLT) { +TEST(UnownedPtr, OperatorLT) { int foos[2]; - CFX_UnownedPtr<int> ptr1(&foos[0]); - CFX_UnownedPtr<int> ptr2(&foos[1]); + UnownedPtr<int> ptr1(&foos[0]); + UnownedPtr<int> ptr2(&foos[1]); EXPECT_FALSE(ptr1 < ptr1); EXPECT_TRUE(ptr1 < ptr2); EXPECT_FALSE(ptr2 < ptr1); } + +} // namespace fxcrt diff --git a/core/fxcrt/xml/cxml_element.h b/core/fxcrt/xml/cxml_element.h index 91ac731021..40ebe385b7 100644 --- a/core/fxcrt/xml/cxml_element.h +++ b/core/fxcrt/xml/cxml_element.h @@ -102,7 +102,7 @@ class CXML_Element : public CXML_Object { friend class CXML_Parser; friend class CXML_Composer; - CFX_UnownedPtr<const CXML_Element> const m_pParent; + UnownedPtr<const CXML_Element> const m_pParent; ByteString m_QSpaceName; ByteString m_TagName; CXML_AttrMap m_AttrMap; diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp index 3ba05ce2c0..7f24378feb 100644 --- a/core/fxge/agg/fx_agg_driver.cpp +++ b/core/fxge/agg/fx_agg_driver.cpp @@ -437,7 +437,7 @@ class CFX_Renderer { RetainPtr<CFX_DIBitmap> m_pOriDevice; RetainPtr<CFX_DIBitmap> m_pClipMask; RetainPtr<CFX_DIBitmap> m_pDevice; - CFX_UnownedPtr<const CFX_ClipRgn> m_pClipRgn; + UnownedPtr<const CFX_ClipRgn> m_pClipRgn; }; void CFX_Renderer::CompositeSpan(uint8_t* dest_scan, diff --git a/core/fxge/android/cfpf_skiafont.h b/core/fxge/android/cfpf_skiafont.h index c842d5abb9..1b2f605838 100644 --- a/core/fxge/android/cfpf_skiafont.h +++ b/core/fxge/android/cfpf_skiafont.h @@ -7,8 +7,8 @@ #ifndef CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_ #define CORE_FXGE_ANDROID_CFPF_SKIAFONT_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_font.h" class CFPF_SkiaFontDescriptor; @@ -43,8 +43,8 @@ class CFPF_SkiaFont { uint8_t uCharset); private: - CFX_UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; - CFX_UnownedPtr<CFPF_SkiaFontDescriptor> m_pFontDes; + UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; + UnownedPtr<CFPF_SkiaFontDescriptor> m_pFontDes; FXFT_Face m_Face; uint32_t m_dwStyle; uint8_t m_uCharset; diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h index 3fde349fb3..653770f095 100644 --- a/core/fxge/android/cfx_androidfontinfo.h +++ b/core/fxge/android/cfx_androidfontinfo.h @@ -7,8 +7,8 @@ #ifndef CORE_FXGE_ANDROID_CFX_ANDROIDFONTINFO_H_ #define CORE_FXGE_ANDROID_CFX_ANDROIDFONTINFO_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" @@ -40,7 +40,7 @@ class CFX_AndroidFontInfo : public IFX_SystemFontInfo { void DeleteFont(void* hFont) override; protected: - CFX_UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; + UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr; }; #endif // CORE_FXGE_ANDROID_CFX_ANDROIDFONTINFO_H_ diff --git a/core/fxge/cfx_facecache.h b/core/fxge/cfx_facecache.h index 58b08edde5..673d0a4cf9 100644 --- a/core/fxge/cfx_facecache.h +++ b/core/fxge/cfx_facecache.h @@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" diff --git a/core/fxge/cfx_folderfontinfo.h b/core/fxge/cfx_folderfontinfo.h index e7c3f21a9f..1123185d69 100644 --- a/core/fxge/cfx_folderfontinfo.h +++ b/core/fxge/cfx_folderfontinfo.h @@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" @@ -63,7 +63,7 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo { std::map<ByteString, std::unique_ptr<CFX_FontFaceInfo>> m_FontList; std::vector<ByteString> m_PathList; - CFX_UnownedPtr<CFX_FontMapper> m_pMapper; + UnownedPtr<CFX_FontMapper> m_pMapper; }; #endif // CORE_FXGE_CFX_FOLDERFONTINFO_H_ diff --git a/core/fxge/cfx_fontmapper.h b/core/fxge/cfx_fontmapper.h index 3f28c73150..b01137fe79 100644 --- a/core/fxge/cfx_fontmapper.h +++ b/core/fxge/cfx_fontmapper.h @@ -78,7 +78,7 @@ class CFX_FontMapper { std::vector<FaceData> m_FaceArray; std::unique_ptr<IFX_SystemFontInfo> m_pFontInfo; FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT]; - CFX_UnownedPtr<CFX_FontMgr> const m_pFontMgr; + UnownedPtr<CFX_FontMgr> const m_pFontMgr; }; #endif // CORE_FXGE_CFX_FONTMAPPER_H_ diff --git a/core/fxge/cfx_renderdevice.h b/core/fxge/cfx_renderdevice.h index 75b0ef3eec..4dc8faa466 100644 --- a/core/fxge/cfx_renderdevice.h +++ b/core/fxge/cfx_renderdevice.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_color.h" #include "core/fxge/fx_dib.h" #include "core/fxge/fx_font.h" @@ -91,7 +91,7 @@ class CFX_RenderDevice { ~StateRestorer(); private: - CFX_UnownedPtr<CFX_RenderDevice> m_pDevice; + UnownedPtr<CFX_RenderDevice> m_pDevice; }; CFX_RenderDevice(); diff --git a/core/fxge/dib/cfx_bitmapcomposer.h b/core/fxge/dib/cfx_bitmapcomposer.h index 7fb3037cc1..98c1f77847 100644 --- a/core/fxge/dib/cfx_bitmapcomposer.h +++ b/core/fxge/dib/cfx_bitmapcomposer.h @@ -9,9 +9,9 @@ #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_scanlinecompositor.h" #include "core/fxge/dib/ifx_scanlinecomposer.h" @@ -57,7 +57,7 @@ class CFX_BitmapComposer : public IFX_ScanlineComposer { const uint8_t* scan_extra_alpha); RetainPtr<CFX_DIBitmap> m_pBitmap; - CFX_UnownedPtr<const CFX_ClipRgn> m_pClipRgn; + UnownedPtr<const CFX_ClipRgn> m_pClipRgn; FXDIB_Format m_SrcFormat; int m_DestLeft; int m_DestTop; diff --git a/core/fxge/dib/cfx_imagerenderer.h b/core/fxge/dib/cfx_imagerenderer.h index 8a441fcea3..18a56e2782 100644 --- a/core/fxge/dib/cfx_imagerenderer.h +++ b/core/fxge/dib/cfx_imagerenderer.h @@ -9,9 +9,9 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_bitmapcomposer.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_dibsource.h" @@ -37,7 +37,7 @@ class CFX_ImageRenderer { private: const RetainPtr<CFX_DIBitmap> m_pDevice; - const CFX_UnownedPtr<const CFX_ClipRgn> m_pClipRgn; + const UnownedPtr<const CFX_ClipRgn> m_pClipRgn; const CFX_Matrix m_Matrix; const int m_BitmapAlpha; const int m_BlendType; diff --git a/core/fxge/dib/cfx_imagestretcher.h b/core/fxge/dib/cfx_imagestretcher.h index 5c696b79a7..2ecb2a0492 100644 --- a/core/fxge/dib/cfx_imagestretcher.h +++ b/core/fxge/dib/cfx_imagestretcher.h @@ -9,10 +9,10 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/ifx_scanlinecomposer.h" #include "core/fxge/fx_dib.h" @@ -40,7 +40,7 @@ class CFX_ImageStretcher { bool ContinueQuickStretch(IFX_PauseIndicator* pPause); bool ContinueStretch(IFX_PauseIndicator* pPause); - CFX_UnownedPtr<IFX_ScanlineComposer> const m_pDest; + UnownedPtr<IFX_ScanlineComposer> const m_pDest; RetainPtr<CFX_DIBSource> m_pSource; std::unique_ptr<CStretchEngine> m_pStretchEngine; std::unique_ptr<uint8_t, FxFreeDeleter> m_pScanline; diff --git a/core/fxge/dib/cfx_imagetransformer.h b/core/fxge/dib/cfx_imagetransformer.h index 65c874585e..40d51ec2a1 100644 --- a/core/fxge/dib/cfx_imagetransformer.h +++ b/core/fxge/dib/cfx_imagetransformer.h @@ -9,9 +9,9 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/dib/cfx_bitmapstorer.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/dib/cfx_dibsource.h" @@ -33,7 +33,7 @@ class CFX_ImageTransformer { private: const RetainPtr<CFX_DIBSource> m_pSrc; - CFX_UnownedPtr<const CFX_Matrix> const m_pMatrix; + UnownedPtr<const CFX_Matrix> const m_pMatrix; const FX_RECT* const m_pClip; FX_RECT m_StretchClip; FX_RECT m_result; diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h index bdf79004a1..8ce8351304 100644 --- a/core/fxge/dib/cstretchengine.h +++ b/core/fxge/dib/cstretchengine.h @@ -9,9 +9,9 @@ #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" class IFX_PauseIndicator; @@ -61,7 +61,7 @@ class CStretchEngine { int m_DestBpp; int m_SrcBpp; int m_bHasAlpha; - CFX_UnownedPtr<IFX_ScanlineComposer> m_pDestBitmap; + UnownedPtr<IFX_ScanlineComposer> m_pDestBitmap; int m_DestWidth; int m_DestHeight; FX_RECT m_DestClip; diff --git a/core/fxge/fx_font.h b/core/fxge/fx_font.h index 89cda1ee5d..321cc4c80a 100644 --- a/core/fxge/fx_font.h +++ b/core/fxge/fx_font.h @@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_substfont.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" @@ -167,7 +167,7 @@ class CFX_Font { void ClearFaceCache(); FXFT_Face m_Face; - mutable CFX_UnownedPtr<CFX_FaceCache> m_FaceCache; + mutable UnownedPtr<CFX_FaceCache> m_FaceCache; std::unique_ptr<CFX_SubstFont> m_pSubstFont; std::vector<uint8_t> m_pFontDataAllocation; uint8_t* m_pFontData; diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp index fe9fd1a852..6b82bc217b 100644 --- a/core/fxge/skia/fx_skia_device.cpp +++ b/core/fxge/skia/fx_skia_device.cpp @@ -1252,7 +1252,7 @@ class SkiaState { } #if SHOW_SKIA_PATH - static int AggSaveCount(const CFX_UnownedPtr<CFX_SkiaDeviceDriver> driver) { + static int AggSaveCount(const UnownedPtr<CFX_SkiaDeviceDriver> driver) { FX_RECT last; int aggSaveCount = 0; bool foundLast = false; @@ -1399,8 +1399,8 @@ class SkiaState { CFX_GraphStateData m_clipState; CFX_GraphStateData m_drawState; CFX_Matrix m_clipMatrix; - CFX_UnownedPtr<CFX_SkiaDeviceDriver> m_pDriver; - CFX_UnownedPtr<CFX_TypeFace> m_pTypeFace; + UnownedPtr<CFX_SkiaDeviceDriver> m_pDriver; + UnownedPtr<CFX_TypeFace> m_pTypeFace; float m_fontSize; float m_scaleX; uint32_t m_fillColor; diff --git a/core/fxge/win32/cfx_psrenderer.cpp b/core/fxge/win32/cfx_psrenderer.cpp index 4f79ef31ad..8a7aac0f8d 100644 --- a/core/fxge/win32/cfx_psrenderer.cpp +++ b/core/fxge/win32/cfx_psrenderer.cpp @@ -81,7 +81,7 @@ void PSCompressData(int PSLevel, } // namespace struct PSGlyph { - CFX_UnownedPtr<CFX_Font> m_pFont; + UnownedPtr<CFX_Font> m_pFont; uint32_t m_GlyphIndex; bool m_bGlyphAdjust; float m_AdjustMatrix[4]; diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 41c3dc3ff1..d87edf7ed1 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -360,7 +360,7 @@ class CFX_Win32FontInfo final : public IFX_SystemFontInfo { ByteString FindFont(const ByteString& name); HDC m_hDC; - CFX_UnownedPtr<CFX_FontMapper> m_pMapper; + UnownedPtr<CFX_FontMapper> m_pMapper; ByteString m_LastFamily; ByteString m_KaiTi, m_FangSong; }; diff --git a/fpdfsdk/cba_annotiterator.h b/fpdfsdk/cba_annotiterator.h index 36eacd91c0..8f9768d1e2 100644 --- a/fpdfsdk/cba_annotiterator.h +++ b/fpdfsdk/cba_annotiterator.h @@ -10,9 +10,9 @@ #include <vector> #include "core/fpdfdoc/cpdf_annot.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 CPDFSDK_Annot; class CPDFSDK_PageView; @@ -38,7 +38,7 @@ class CBA_AnnotIterator { std::vector<size_t>* aSelect); TabOrder m_eTabOrder; - CFX_UnownedPtr<CPDFSDK_PageView> m_pPageView; + UnownedPtr<CPDFSDK_PageView> m_pPageView; CPDF_Annot::Subtype m_nAnnotSubtype; std::vector<CPDFSDK_Annot*> m_Annots; }; diff --git a/fpdfsdk/cfx_systemhandler.h b/fpdfsdk/cfx_systemhandler.h index a2ad02438e..f9138cc078 100644 --- a/fpdfsdk/cfx_systemhandler.h +++ b/fpdfsdk/cfx_systemhandler.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_CFX_SYSTEMHANDLER_H_ #define FPDFSDK_CFX_SYSTEMHANDLER_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" using TimerCallback = void (*)(int32_t idEvent); @@ -67,7 +67,7 @@ class CFX_SystemHandler { void KillTimer(int32_t nID); private: - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; }; #endif // FPDFSDK_CFX_SYSTEMHANDLER_H_ diff --git a/fpdfsdk/cpdfsdk_annot.h b/fpdfsdk/cpdfsdk_annot.h index 325b4298ef..a6c4066ea5 100644 --- a/fpdfsdk/cpdfsdk_annot.h +++ b/fpdfsdk/cpdfsdk_annot.h @@ -10,8 +10,8 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_defaultappearance.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/observable.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/fsdk_common.h" #include "fpdfsdk/fsdk_define.h" @@ -50,7 +50,7 @@ class CPDFSDK_Annot : public Observable<CPDFSDK_Annot> { CPDFSDK_PageView* GetPageView() const { return m_pPageView.Get(); } protected: - CFX_UnownedPtr<CPDFSDK_PageView> const m_pPageView; + UnownedPtr<CPDFSDK_PageView> const m_pPageView; }; #endif // FPDFSDK_CPDFSDK_ANNOT_H_ diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.h b/fpdfsdk/cpdfsdk_annothandlermgr.h index 21ccb3a2fb..df4e1a224c 100644 --- a/fpdfsdk/cpdfsdk_annothandlermgr.h +++ b/fpdfsdk/cpdfsdk_annothandlermgr.h @@ -11,8 +11,8 @@ #include <memory> #include "core/fpdfdoc/cpdf_annot.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/cpdfsdk_annot.h" class CFX_Matrix; diff --git a/fpdfsdk/cpdfsdk_baannot.h b/fpdfsdk/cpdfsdk_baannot.h index c7300c46e5..ac3c0cb384 100644 --- a/fpdfsdk/cpdfsdk_baannot.h +++ b/fpdfsdk/cpdfsdk_baannot.h @@ -95,7 +95,7 @@ class CPDFSDK_BAAnnot : public CPDFSDK_Annot { int GetLayoutOrder() const override; protected: - CFX_UnownedPtr<CPDF_Annot> const m_pAnnot; + UnownedPtr<CPDF_Annot> const m_pAnnot; }; #endif // FPDFSDK_CPDFSDK_BAANNOT_H_ diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index d6f7088c1f..31a1c5156c 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h @@ -227,7 +227,7 @@ class CPDFSDK_FormFillEnvironment std::map<UnderlyingPageType*, std::unique_ptr<CPDFSDK_PageView>> m_PageMap; std::unique_ptr<CPDFSDK_InterForm> m_pInterForm; CPDFSDK_Annot::ObservedPtr m_pFocusAnnot; - CFX_UnownedPtr<UnderlyingDocumentType> m_pUnderlyingDoc; + UnownedPtr<UnderlyingDocumentType> m_pUnderlyingDoc; std::unique_ptr<CFFL_InteractiveFormFiller> m_pFormFiller; std::unique_ptr<CFX_SystemHandler> m_pSysHandler; bool m_bChangeMask; diff --git a/fpdfsdk/cpdfsdk_interform.h b/fpdfsdk/cpdfsdk_interform.h index e14589ec59..76acaf9ebf 100644 --- a/fpdfsdk/cpdfsdk_interform.h +++ b/fpdfsdk/cpdfsdk_interform.h @@ -13,7 +13,7 @@ #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/ipdf_formnotify.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/fx_dib.h" #include "fpdfsdk/cpdfsdk_widget.h" @@ -121,7 +121,7 @@ class CPDFSDK_InterForm : public IPDF_FormNotify { using CPDFSDK_WidgetMap = std::map<CPDF_FormControl*, CPDFSDK_Widget*>; - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> m_pFormFillEnv; std::unique_ptr<CPDF_InterForm> m_pInterForm; CPDFSDK_WidgetMap m_Map; #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h index b86f30512f..03f3ab6318 100644 --- a/fpdfsdk/cpdfsdk_pageview.h +++ b/fpdfsdk/cpdfsdk_pageview.h @@ -11,8 +11,8 @@ #include <vector> #include "core/fpdfapi/page/cpdf_page.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/cpdfsdk_annothandlermgr.h" @@ -117,7 +117,7 @@ class CPDFSDK_PageView final : public CPDF_Page::View { UnderlyingPageType* const m_page; std::unique_ptr<CPDF_AnnotList> m_pAnnotList; std::vector<CPDFSDK_Annot*> m_SDKAnnotArray; - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; CPDFSDK_Annot::ObservedPtr m_pCaptureWidget; #ifndef PDF_ENABLE_XFA bool m_bOwnsPage; diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h index 5b2411e170..f57e08d526 100644 --- a/fpdfsdk/cpdfsdk_widget.h +++ b/fpdfsdk/cpdfsdk_widget.h @@ -12,9 +12,9 @@ #include "core/fpdfdoc/cpdf_aaction.h" #include "core/fpdfdoc/cpdf_action.h" #include "core/fpdfdoc/cpdf_annot.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" #include "core/fxge/cfx_color.h" #include "fpdfsdk/cpdfsdk_baannot.h" #include "fpdfsdk/pdfsdk_fieldaction.h" @@ -147,14 +147,14 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot { CFX_Color GetFillPWLColor() const; private: - CFX_UnownedPtr<CPDFSDK_InterForm> const m_pInterForm; + UnownedPtr<CPDFSDK_InterForm> const m_pInterForm; bool m_bAppModified; uint32_t m_nAppearanceAge; uint32_t m_nValueAge; #ifdef PDF_ENABLE_XFA - mutable CFX_UnownedPtr<CXFA_FFWidget> m_hMixXFAWidget; - mutable CFX_UnownedPtr<CXFA_FFWidgetHandler> m_pWidgetHandler; + mutable UnownedPtr<CXFA_FFWidget> m_hMixXFAWidget; + mutable UnownedPtr<CXFA_FFWidgetHandler> m_pWidgetHandler; #endif // PDF_ENABLE_XFA }; diff --git a/fpdfsdk/cpdfsdk_widgethandler.h b/fpdfsdk/cpdfsdk_widgethandler.h index d83c98f255..f8aa7de5bd 100644 --- a/fpdfsdk/cpdfsdk_widgethandler.h +++ b/fpdfsdk/cpdfsdk_widgethandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_CPDFSDK_WIDGETHANDLER_H_ #define FPDFSDK_CPDFSDK_WIDGETHANDLER_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/ipdfsdk_annothandler.h" class CFFL_InteractiveFormFiller; @@ -103,8 +103,8 @@ class CPDFSDK_WidgetHandler : public IPDFSDK_AnnotHandler { } private: - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; - CFX_UnownedPtr<CFFL_InteractiveFormFiller> const m_pFormFiller; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CFFL_InteractiveFormFiller> const m_pFormFiller; }; #endif // FPDFSDK_CPDFSDK_WIDGETHANDLER_H_ diff --git a/fpdfsdk/cpdfsdk_xfawidget.h b/fpdfsdk/cpdfsdk_xfawidget.h index 42448b804f..d2635eb4e1 100644 --- a/fpdfsdk/cpdfsdk_xfawidget.h +++ b/fpdfsdk/cpdfsdk_xfawidget.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_CPDFSDK_XFAWIDGET_H_ #define FPDFSDK_CPDFSDK_XFAWIDGET_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" #include "fpdfsdk/cpdfsdk_annot.h" class CPDFSDK_InterForm; @@ -32,8 +32,8 @@ class CPDFSDK_XFAWidget : public CPDFSDK_Annot { CPDFSDK_InterForm* GetInterForm() const { return m_pInterForm.Get(); } private: - CFX_UnownedPtr<CPDFSDK_InterForm> m_pInterForm; - CFX_UnownedPtr<CXFA_FFWidget> m_hXFAWidget; + UnownedPtr<CPDFSDK_InterForm> m_pInterForm; + UnownedPtr<CXFA_FFWidget> m_hXFAWidget; }; #endif // FPDFSDK_CPDFSDK_XFAWIDGET_H_ diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.h b/fpdfsdk/cpdfsdk_xfawidgethandler.h index e26472d69c..e0dccbe685 100644 --- a/fpdfsdk/cpdfsdk_xfawidgethandler.h +++ b/fpdfsdk/cpdfsdk_xfawidgethandler.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_ #define FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/ipdfsdk_annothandler.h" class CFX_Matrix; @@ -94,7 +94,7 @@ class CPDFSDK_XFAWidgetHandler : public IPDFSDK_AnnotHandler { CXFA_FFWidgetHandler* GetXFAWidgetHandler(CPDFSDK_Annot* pAnnot); uint32_t GetFWLFlags(uint32_t dwFlag); - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; }; #endif // FPDFSDK_CPDFSDK_XFAWIDGETHANDLER_H_ diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/fpdfsdk/formfiller/cba_fontmap.h index 807cb65f4f..45df8c82ad 100644 --- a/fpdfsdk/formfiller/cba_fontmap.h +++ b/fpdfsdk/formfiller/cba_fontmap.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_FORMFILLER_CBA_FONTMAP_H_ #define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_font_map.h" class CPDF_Dictionary; @@ -36,9 +36,9 @@ class CBA_FontMap : public CPWL_FontMap { CPDF_Font* GetAnnotDefaultFont(ByteString* csNameTag); void AddFontToAnnotDict(CPDF_Font* pFont, const ByteString& sAlias); - CFX_UnownedPtr<CPDF_Document> m_pDocument; - CFX_UnownedPtr<CPDF_Dictionary> m_pAnnotDict; - CFX_UnownedPtr<CPDF_Font> m_pDefaultFont; + UnownedPtr<CPDF_Document> m_pDocument; + UnownedPtr<CPDF_Dictionary> m_pAnnotDict; + UnownedPtr<CPDF_Font> m_pDefaultFont; ByteString m_sDefaultFontName; ByteString m_sAPType; }; diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index 26f6052df8..11a2f8c935 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -9,7 +9,7 @@ #include <map> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/formfiller/cba_fontmap.h" #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h" #include "fpdfsdk/pdfsdk_fieldaction.h" @@ -152,8 +152,8 @@ class CFFL_FormFiller : public CPWL_Wnd::ProviderIface, void InvalidateRect(const FX_RECT& rect); - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; - CFX_UnownedPtr<CPDFSDK_Widget> m_pWidget; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_Widget> m_pWidget; bool m_bValid; CFFL_PageView2PDFWindow m_Maps; }; diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h index 553cbe8f1d..7485dcfd6c 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h @@ -11,7 +11,7 @@ #include <memory> #include <utility> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/fsdk_define.h" #include "fpdfsdk/pwl/cpwl_edit.h" @@ -148,7 +148,7 @@ class CFFL_InteractiveFormFiller : public IPWL_Filler_Notify { #endif // PDF_ENABLE_XFA void UnRegisterFormFiller(CPDFSDK_Annot* pAnnot); - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; CFFL_Widget2Filler m_Maps; bool m_bNotifying; }; diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 875f3fd992..67b9a08beb 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -124,7 +124,7 @@ FPDF_EXPORT const FPDF_CharsetFontMap* FPDF_CALLCONV FPDF_GetDefaultTTFMap() { } struct FPDF_SYSFONTINFO_DEFAULT : public FPDF_SYSFONTINFO { - CFX_UnownedPtr<IFX_SystemFontInfo> m_pFontInfo; + UnownedPtr<IFX_SystemFontInfo> m_pFontInfo; }; static void DefaultRelease(struct _FPDF_SYSFONTINFO* pThis) { diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index e08a3bf17f..3125ad1a82 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -160,8 +160,8 @@ class CPDF_AnnotContext { private: std::unique_ptr<CPDF_Form> m_pAnnotForm; - CFX_UnownedPtr<CPDF_Dictionary> m_pAnnotDict; - CFX_UnownedPtr<CPDF_Page> m_pPage; + UnownedPtr<CPDF_Dictionary> m_pAnnotDict; + UnownedPtr<CPDF_Page> m_pPage; }; CPDF_AnnotContext* CPDFAnnotContextFromFPDFAnnotation(FPDF_ANNOTATION annot) { diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index 6409f70fe2..b52cccf098 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -87,7 +87,7 @@ class PDFDocTest : public testing::Test { protected: std::unique_ptr<CPDF_TestPdfDocument> m_pDoc; - CFX_UnownedPtr<CPDF_IndirectObjectHolder> m_pIndirectObjs; + UnownedPtr<CPDF_IndirectObjectHolder> m_pIndirectObjs; std::unique_ptr<CPDF_Dictionary> m_pRootObj; }; diff --git a/fpdfsdk/fpdfppo.cpp b/fpdfsdk/fpdfppo.cpp index 230fd14fc8..153ae2e20c 100644 --- a/fpdfsdk/fpdfppo.cpp +++ b/fpdfsdk/fpdfppo.cpp @@ -18,7 +18,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/fsdk_define.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" @@ -141,8 +141,8 @@ class CPDF_PageOrganizer { bool UpdateReference(CPDF_Object* pObj, ObjectNumberMap* pObjNumberMap); uint32_t GetNewObjId(ObjectNumberMap* pObjNumberMap, CPDF_Reference* pRef); - CFX_UnownedPtr<CPDF_Document> m_pDestPDFDoc; - CFX_UnownedPtr<CPDF_Document> m_pSrcPDFDoc; + UnownedPtr<CPDF_Document> m_pDestPDFDoc; + UnownedPtr<CPDF_Document> m_pSrcPDFDoc; }; CPDF_PageOrganizer::CPDF_PageOrganizer(CPDF_Document* pDestPDFDoc, diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h index df42cbb9fd..52af64ac86 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h @@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/observable.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h" #include "xfa/fxfa/cxfa_ffdoc.h" @@ -105,7 +105,7 @@ class CPDFXFA_Context : public IXFA_AppProvider { std::unique_ptr<CPDF_Document> m_pPDFDoc; std::unique_ptr<CXFA_FFDoc> m_pXFADoc; Observable<CPDFSDK_FormFillEnvironment>::ObservedPtr m_pFormFillEnv; - CFX_UnownedPtr<CXFA_FFDocView> m_pXFADocView; + UnownedPtr<CXFA_FFDocView> m_pXFADocView; std::unique_ptr<CXFA_FFApp> m_pXFAApp; std::unique_ptr<CJS_Runtime> m_pRuntime; std::vector<RetainPtr<CPDFXFA_Page>> m_XFAPageList; diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h index 6f7d41d86e..62830b0804 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ #define FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "public/fpdfview.h" #include "xfa/fxfa/fxfa.h" @@ -106,7 +106,7 @@ class CPDFXFA_DocEnvironment : public IXFA_DocEnvironment { FPDF_DWORD flag); void ToXFAContentFlags(WideString csSrcContent, FPDF_DWORD& flag); - CFX_UnownedPtr<CPDFXFA_Context> const m_pContext; + UnownedPtr<CPDFXFA_Context> const m_pContext; }; #endif // FPDFSDK_FPDFXFA_CPDFXFA_DOCENVIRONMENT_H_ diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h index 5c4e0dca76..f64d66b10c 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h @@ -9,9 +9,9 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_Matrix; class CPDFXFA_Context; @@ -74,7 +74,7 @@ class CPDFXFA_Page : public Retainable { private: std::unique_ptr<CPDF_Page> m_pPDFPage; CXFA_FFPageView* m_pXFAPageView; - CFX_UnownedPtr<CPDFXFA_Context> const m_pContext; + UnownedPtr<CPDFXFA_Context> const m_pContext; const int m_iPageIndex; }; diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h index 2b22c5fb75..d763f025ff 100644 --- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h +++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" #include "xfa/fwl/cfwl_timerinfo.h" #include "xfa/fwl/ifwl_adaptertimermgr.h" @@ -30,7 +30,7 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { static void TimerProc(int32_t idEvent); static std::vector<CFWL_TimerInfo*>* s_TimerArray; - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; }; #endif // FPDFSDK_FPDFXFA_CXFA_FWLADAPTERTIMERMGR_H_ diff --git a/fpdfsdk/fsdk_pauseadapter.h b/fpdfsdk/fsdk_pauseadapter.h index 25028f8d67..a0d009874e 100644 --- a/fpdfsdk/fsdk_pauseadapter.h +++ b/fpdfsdk/fsdk_pauseadapter.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_FSDK_PAUSEADAPTER_H_ #define FPDFSDK_FSDK_PAUSEADAPTER_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/ifx_pauseindicator.h" +#include "core/fxcrt/unowned_ptr.h" #include "public/fpdf_progressive.h" class IFSDK_PAUSE_Adapter : public IFX_PauseIndicator { @@ -20,7 +20,7 @@ class IFSDK_PAUSE_Adapter : public IFX_PauseIndicator { bool NeedToPauseNow() override; private: - CFX_UnownedPtr<IFSDK_PAUSE> const m_IPause; + UnownedPtr<IFSDK_PAUSE> const m_IPause; }; #endif // FPDFSDK_FSDK_PAUSEADAPTER_H_ diff --git a/fpdfsdk/javascript/JS_EventHandler.h b/fpdfsdk/javascript/JS_EventHandler.h index 8273b41cc5..6f10ba596c 100644 --- a/fpdfsdk/javascript/JS_EventHandler.h +++ b/fpdfsdk/javascript/JS_EventHandler.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_H_ #define FPDFSDK_JAVASCRIPT_JS_EVENTHANDLER_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" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" class CJS_EventContext; @@ -166,13 +166,13 @@ class CJS_EventHandler { JS_EVENT_T EventType() { return m_eEventType; } public: - CFX_UnownedPtr<CJS_EventContext> const m_pJSEventContext; + UnownedPtr<CJS_EventContext> const m_pJSEventContext; JS_EVENT_T m_eEventType; bool m_bValid; WideString m_strTargetName; WideString m_strSourceName; - CFX_UnownedPtr<WideString> m_pWideStrChange; + UnownedPtr<WideString> m_pWideStrChange; WideString m_WideStrChangeDu; WideString m_WideStrChangeEx; int m_nCommitKey; @@ -184,12 +184,12 @@ class CJS_EventHandler { int* m_pISelStart; int m_nSelStartDu; bool m_bWillCommit; - CFX_UnownedPtr<WideString> m_pValue; + UnownedPtr<WideString> m_pValue; bool m_bFieldFull; bool* m_pbRc; bool m_bRcDu; - CFX_UnownedPtr<CPDF_Bookmark> m_pTargetBookMark; + UnownedPtr<CPDF_Bookmark> m_pTargetBookMark; CPDFSDK_FormFillEnvironment::ObservedPtr m_pTargetFormFillEnv; CPDFSDK_Annot::ObservedPtr m_pTargetAnnot; }; diff --git a/fpdfsdk/javascript/JS_Object.h b/fpdfsdk/javascript/JS_Object.h index e32b8515b5..293b98acf6 100644 --- a/fpdfsdk/javascript/JS_Object.h +++ b/fpdfsdk/javascript/JS_Object.h @@ -26,7 +26,7 @@ class CJS_EmbedObj { CJS_Object* GetJSObject() const { return m_pJSObject.Get(); } protected: - CFX_UnownedPtr<CJS_Object> const m_pJSObject; + UnownedPtr<CJS_Object> const m_pJSObject; }; class CJS_Object { diff --git a/fpdfsdk/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/javascript/JS_Runtime_Stub.cpp index 068031f450..d25e257851 100644 --- a/fpdfsdk/javascript/JS_Runtime_Stub.cpp +++ b/fpdfsdk/javascript/JS_Runtime_Stub.cpp @@ -6,7 +6,7 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/javascript/ijs_event_context.h" #include "fpdfsdk/javascript/ijs_runtime.h" #include "third_party/base/ptr_util.h" @@ -152,7 +152,7 @@ class CJS_RuntimeStub final : public IJS_Runtime { } protected: - CFX_UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; + UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv; std::unique_ptr<CJS_EventContextStub> m_pContext; }; diff --git a/fpdfsdk/javascript/JS_Value.h b/fpdfsdk/javascript/JS_Value.h index 1d430ee06c..8c94ca742a 100644 --- a/fpdfsdk/javascript/JS_Value.h +++ b/fpdfsdk/javascript/JS_Value.h @@ -117,7 +117,7 @@ class CJS_PropValue { private: bool m_bIsSetting; CJS_Value m_Value; - CFX_UnownedPtr<CJS_Runtime> const m_pJSRuntime; + UnownedPtr<CJS_Runtime> const m_pJSRuntime; }; class CJS_Array { diff --git a/fpdfsdk/javascript/cjs_event_context.h b/fpdfsdk/javascript/cjs_event_context.h index a27bbd73af..e6ab94e4be 100644 --- a/fpdfsdk/javascript/cjs_event_context.h +++ b/fpdfsdk/javascript/cjs_event_context.h @@ -9,9 +9,9 @@ #include <memory> -#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" #include "fpdfsdk/javascript/ijs_event_context.h" class CJS_EventHandler; @@ -128,7 +128,7 @@ class CJS_EventContext : public IJS_EventContext { CPDFSDK_FormFillEnvironment* GetFormFillEnv(); private: - CFX_UnownedPtr<CJS_Runtime> const m_pRuntime; + UnownedPtr<CJS_Runtime> const m_pRuntime; std::unique_ptr<CJS_EventHandler> m_pEventHandler; bool m_bBusy; }; diff --git a/fpdfsdk/pwl/cpwl_appstream.h b/fpdfsdk/pwl/cpwl_appstream.h index d73e3aa0a7..810e79c9e7 100644 --- a/fpdfsdk/pwl/cpwl_appstream.h +++ b/fpdfsdk/pwl/cpwl_appstream.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_PWL_CPWL_APPSTREAM_H_ #define FPDFSDK_PWL_CPWL_APPSTREAM_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" class CPDFSDK_Widget; class CPDF_Dictionary; @@ -36,8 +36,8 @@ class CPWL_AppStream { ByteString GetBackgroundAppStream() const; ByteString GetBorderAppStream() const; - CFX_UnownedPtr<CPDFSDK_Widget> widget_; - CFX_UnownedPtr<CPDF_Dictionary> dict_; + UnownedPtr<CPDFSDK_Widget> widget_; + UnownedPtr<CPDF_Dictionary> dict_; }; #endif // FPDFSDK_PWL_CPWL_APPSTREAM_H_ diff --git a/fpdfsdk/pwl/cpwl_combo_box.h b/fpdfsdk/pwl/cpwl_combo_box.h index c9fa2cda4b..d8e384e501 100644 --- a/fpdfsdk/pwl/cpwl_combo_box.h +++ b/fpdfsdk/pwl/cpwl_combo_box.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_edit.h" #include "fpdfsdk/pwl/cpwl_list_box.h" #include "fpdfsdk/pwl/cpwl_wnd.h" @@ -89,15 +89,15 @@ class CPWL_ComboBox : public CPWL_Wnd { void CreateListBox(const CreateParams& cp); void SetPopup(bool bPopup); - CFX_UnownedPtr<CPWL_Edit> m_pEdit; - CFX_UnownedPtr<CPWL_CBButton> m_pButton; - CFX_UnownedPtr<CPWL_CBListBox> m_pList; + UnownedPtr<CPWL_Edit> m_pEdit; + UnownedPtr<CPWL_CBButton> m_pButton; + UnownedPtr<CPWL_CBListBox> m_pList; CFX_FloatRect m_rcOldWindow; bool m_bPopup = false; bool m_bBottom = true; int32_t m_nSelectItem = -1; - CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; - CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller; + UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; + UnownedPtr<CFFL_FormFiller> m_pFormFiller; }; #endif // FPDFSDK_PWL_CPWL_COMBO_BOX_H_ diff --git a/fpdfsdk/pwl/cpwl_edit.h b/fpdfsdk/pwl/cpwl_edit.h index d61b94730e..d093f44d84 100644 --- a/fpdfsdk/pwl/cpwl_edit.h +++ b/fpdfsdk/pwl/cpwl_edit.h @@ -10,7 +10,7 @@ #include <utility> #include "core/fpdfdoc/cpvt_wordrange.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_edit_ctrl.h" #define PWL_CLASSNAME_EDIT "CPWL_Edit" @@ -129,8 +129,8 @@ class CPWL_Edit : public CPWL_EditCtrl { bool m_bFocus; CFX_FloatRect m_rcOldWindow; - CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; - CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller; + UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; + UnownedPtr<CFFL_FormFiller> m_pFormFiller; }; #endif // FPDFSDK_PWL_CPWL_EDIT_H_ diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h index a63b22cd10..76f756eb1c 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.h +++ b/fpdfsdk/pwl/cpwl_edit_impl.h @@ -13,7 +13,7 @@ #include "core/fpdfdoc/cpvt_secprops.h" #include "core/fpdfdoc/cpvt_wordprops.h" -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #define FX_EDIT_ISLATINWORD(u) \ (u == 0x2D || (u <= 0x005A && u >= 0x0041) || \ @@ -144,7 +144,7 @@ class CFXEU_InsertWord : public IFX_Edit_UndoItem { void Undo() override; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPVT_WordPlace m_wpOld; CPVT_WordPlace m_wpNew; @@ -167,7 +167,7 @@ class CFXEU_InsertReturn : public IFX_Edit_UndoItem { void Undo() override; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPVT_WordPlace m_wpOld; CPVT_WordPlace m_wpNew; @@ -191,7 +191,7 @@ class CFXEU_Backspace : public IFX_Edit_UndoItem { void Undo() override; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPVT_WordPlace m_wpOld; CPVT_WordPlace m_wpNew; @@ -218,7 +218,7 @@ class CFXEU_Delete : public IFX_Edit_UndoItem { void Undo() override; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPVT_WordPlace m_wpOld; CPVT_WordPlace m_wpNew; @@ -241,7 +241,7 @@ class CFXEU_Clear : public IFX_Edit_UndoItem { void Undo() override; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPVT_WordRange m_wrSel; WideString m_swText; @@ -261,7 +261,7 @@ class CFXEU_InsertText : public IFX_Edit_UndoItem { void Undo() override; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPVT_WordPlace m_wpOld; CPVT_WordPlace m_wpNew; @@ -430,8 +430,8 @@ class CPWL_EditImpl { private: std::unique_ptr<CPDF_VariableText> m_pVT; - CFX_UnownedPtr<CPWL_EditCtrl> m_pNotify; - CFX_UnownedPtr<CPWL_Edit> m_pOperationNotify; + UnownedPtr<CPWL_EditCtrl> m_pNotify; + UnownedPtr<CPWL_Edit> m_pOperationNotify; std::unique_ptr<CPWL_EditImpl_Provider> m_pVTProvider; CPVT_WordPlace m_wpCaret; CPVT_WordPlace m_wpOldCaret; @@ -466,7 +466,7 @@ class CPWL_EditImpl_Iterator { const CPVT_WordPlace& GetAt() const; private: - CFX_UnownedPtr<CPWL_EditImpl> m_pEdit; + UnownedPtr<CPWL_EditImpl> m_pEdit; CPDF_VariableText::Iterator* m_pVTIterator; }; diff --git a/fpdfsdk/pwl/cpwl_font_map.h b/fpdfsdk/pwl/cpwl_font_map.h index 5336949399..0712bf1240 100644 --- a/fpdfsdk/pwl/cpwl_font_map.h +++ b/fpdfsdk/pwl/cpwl_font_map.h @@ -88,7 +88,7 @@ class CPWL_FontMap : public IPVT_FontMap { uint8_t nCharset); std::unique_ptr<CPDF_Document> m_pPDFDoc; - CFX_UnownedPtr<CFX_SystemHandler> const m_pSystemHandler; + UnownedPtr<CFX_SystemHandler> const m_pSystemHandler; }; #endif // FPDFSDK_PWL_CPWL_FONT_MAP_H_ diff --git a/fpdfsdk/pwl/cpwl_icon.h b/fpdfsdk/pwl/cpwl_icon.h index e2f792b9d5..df88465a5a 100644 --- a/fpdfsdk/pwl/cpwl_icon.h +++ b/fpdfsdk/pwl/cpwl_icon.h @@ -9,8 +9,8 @@ #include <utility> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_wnd.h" class CPWL_Icon : public CPWL_Wnd { @@ -37,8 +37,8 @@ class CPWL_Icon : public CPWL_Wnd { // width, height std::pair<float, float> GetImageSize(); - CFX_UnownedPtr<CPDF_Stream> m_pPDFStream; - CFX_UnownedPtr<CPDF_IconFit> m_pIconFit; + UnownedPtr<CPDF_Stream> m_pPDFStream; + UnownedPtr<CPDF_IconFit> m_pIconFit; }; #endif // FPDFSDK_PWL_CPWL_ICON_H_ diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h index 1e028f7299..fec4d63a0c 100644 --- a/fpdfsdk/pwl/cpwl_list_box.h +++ b/fpdfsdk/pwl/cpwl_list_box.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_wnd.h" class CPWL_ListCtrl; @@ -35,7 +35,7 @@ class CPWL_List_Notify { void IOnInvalidateRect(CFX_FloatRect* pRect); private: - CFX_UnownedPtr<CPWL_ListBox> m_pList; + UnownedPtr<CPWL_ListBox> m_pList; }; class CPWL_ListBox : public CPWL_Wnd { @@ -101,10 +101,10 @@ class CPWL_ListBox : public CPWL_Wnd { std::unique_ptr<CPWL_List_Notify> m_pListNotify; bool m_bMouseDown; bool m_bHoverSel; - CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; + UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify; private: - CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller; + UnownedPtr<CFFL_FormFiller> m_pFormFiller; }; #endif // FPDFSDK_PWL_CPWL_LIST_BOX_H_ diff --git a/fpdfsdk/pwl/cpwl_list_impl.h b/fpdfsdk/pwl/cpwl_list_impl.h index 18ca0a3a15..e39a9c8b20 100644 --- a/fpdfsdk/pwl/cpwl_list_impl.h +++ b/fpdfsdk/pwl/cpwl_list_impl.h @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#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 CPWL_EditImpl; class CPWL_EditImpl_Iterator; @@ -152,7 +152,7 @@ class CPWL_ListCtrl { CFX_FloatRect m_rcPlate; CFX_FloatRect m_rcContent; - CFX_UnownedPtr<CPWL_List_Notify> m_pNotify; + UnownedPtr<CPWL_List_Notify> m_pNotify; bool m_bNotifyFlag; CFX_PointF m_ptScrollPos; CPLST_Select m_aSelItems; // for multiple @@ -162,7 +162,7 @@ class CPWL_ListCtrl { int32_t m_nCaretIndex; // for multiple std::vector<std::unique_ptr<Item>> m_ListItems; float m_fFontSize; - CFX_UnownedPtr<IPVT_FontMap> m_pFontMap; + UnownedPtr<IPVT_FontMap> m_pFontMap; bool m_bMultiple; }; diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h index 48aef16e38..1e71e3b90f 100644 --- a/fpdfsdk/pwl/cpwl_scroll_bar.h +++ b/fpdfsdk/pwl/cpwl_scroll_bar.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PWL_CPWL_SCROLL_BAR_H_ #define FPDFSDK_PWL_CPWL_SCROLL_BAR_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fpdfsdk/pwl/cpwl_wnd.h" class CPWL_SBButton; @@ -170,9 +170,9 @@ class CPWL_ScrollBar : public CPWL_Wnd { PWL_SCROLLBAR_TYPE m_sbType; PWL_SCROLL_INFO m_OriginInfo; - CFX_UnownedPtr<CPWL_SBButton> m_pMinButton; - CFX_UnownedPtr<CPWL_SBButton> m_pMaxButton; - CFX_UnownedPtr<CPWL_SBButton> m_pPosButton; + UnownedPtr<CPWL_SBButton> m_pMinButton; + UnownedPtr<CPWL_SBButton> m_pMaxButton; + UnownedPtr<CPWL_SBButton> m_pPosButton; PWL_SCROLL_PRIVATEDATA m_sData; bool m_bMouseDown; bool m_bMinOrMax; diff --git a/fpdfsdk/pwl/cpwl_timer.h b/fpdfsdk/pwl/cpwl_timer.h index 4a07425993..6e082abd4b 100644 --- a/fpdfsdk/pwl/cpwl_timer.h +++ b/fpdfsdk/pwl/cpwl_timer.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_PWL_CPWL_TIMER_H_ #define FPDFSDK_PWL_CPWL_TIMER_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CFX_SystemHandler; class CPWL_TimerHandler; @@ -24,8 +24,8 @@ class CPWL_Timer { private: int32_t m_nTimerID; - CFX_UnownedPtr<CPWL_TimerHandler> m_pAttached; - CFX_UnownedPtr<CFX_SystemHandler> m_pSystemHandler; + UnownedPtr<CPWL_TimerHandler> m_pAttached; + UnownedPtr<CFX_SystemHandler> m_pSystemHandler; }; #endif // FPDFSDK_PWL_CPWL_TIMER_H_ diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 9abe03c3fb..d7eb853c8f 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -131,9 +131,9 @@ class CPWL_MsgControl : public Observable<CPWL_MsgControl> { private: std::vector<CPWL_Wnd*> m_aMousePath; std::vector<CPWL_Wnd*> m_aKeyboardPath; - CFX_UnownedPtr<CPWL_Wnd> m_pCreatedWnd; - CFX_UnownedPtr<CPWL_Wnd> m_pMainMouseWnd; - CFX_UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd; + UnownedPtr<CPWL_Wnd> m_pCreatedWnd; + UnownedPtr<CPWL_Wnd> m_pMainMouseWnd; + UnownedPtr<CPWL_Wnd> m_pMainKeyboardWnd; }; CPWL_Wnd::CPWL_Wnd() diff --git a/fpdfsdk/pwl/cpwl_wnd.h b/fpdfsdk/pwl/cpwl_wnd.h index ecef1e2e10..11b62b337c 100644 --- a/fpdfsdk/pwl/cpwl_wnd.h +++ b/fpdfsdk/pwl/cpwl_wnd.h @@ -11,8 +11,8 @@ #include <vector> #include "core/fpdfdoc/cpdf_formcontrol.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/observable.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_color.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" @@ -131,7 +131,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { CFX_SystemHandler* pSystemHandler; // required IPVT_FontMap* pFontMap; // required ProviderIface::ObservedPtr pProvider; // required - CFX_UnownedPtr<FocusHandlerIface> pFocusHandler; // optional + UnownedPtr<FocusHandlerIface> pFocusHandler; // optional uint32_t dwFlags; // optional CFX_Color sBackgroundColor; // optional CPDFSDK_Widget::ObservedPtr pAttachedWidget; // required @@ -142,7 +142,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { int32_t nTransparency; // optional float fFontSize; // optional CPWL_Dash sDash; // optional - CFX_UnownedPtr<PrivateData> pAttachedData; // optional + UnownedPtr<PrivateData> pAttachedData; // optional CPWL_Wnd* pParentWnd; // ignore CPWL_MsgControl* pMsgControl; // ignore int32_t eCursorType; // ignore @@ -311,7 +311,7 @@ class CPWL_Wnd : public CPWL_TimerHandler, public Observable<CPWL_Wnd> { CreateParams m_CreationParams; std::vector<CPWL_Wnd*> m_Children; - CFX_UnownedPtr<CPWL_ScrollBar> m_pVScrollBar; + UnownedPtr<CPWL_ScrollBar> m_pVScrollBar; CFX_FloatRect m_rcWindow; CFX_FloatRect m_rcClip; bool m_bCreated; diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h index d4e3ee8881..e45c8a4976 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomon.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CBC_ReedSolomonGF256; class CBC_ReedSolomonGF256Poly; @@ -26,7 +26,7 @@ class CBC_ReedSolomonEncoder { private: CBC_ReedSolomonGF256Poly* BuildGenerator(size_t degree); - CFX_UnownedPtr<CBC_ReedSolomonGF256> const m_field; + UnownedPtr<CBC_ReedSolomonGF256> const m_field; std::vector<std::unique_ptr<CBC_ReedSolomonGF256Poly>> m_cachedGenerators; }; diff --git a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h index 4730625bf8..810b4782bb 100644 --- a/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h +++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CBC_ReedSolomonGF256; @@ -40,7 +40,7 @@ class CBC_ReedSolomonGF256Poly final { std::unique_ptr<CBC_ReedSolomonGF256Poly> Clone() const; private: - CFX_UnownedPtr<CBC_ReedSolomonGF256> m_field; + UnownedPtr<CBC_ReedSolomonGF256> m_field; std::vector<int32_t> m_coefficients; }; diff --git a/fxbarcode/datamatrix/BC_EncoderContext.h b/fxbarcode/datamatrix/BC_EncoderContext.h index 1289a45e68..3881319d61 100644 --- a/fxbarcode/datamatrix/BC_EncoderContext.h +++ b/fxbarcode/datamatrix/BC_EncoderContext.h @@ -7,7 +7,7 @@ #ifndef FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_ #define FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxcrt/widestring.h" class CBC_SymbolInfo; @@ -38,7 +38,7 @@ class CBC_EncoderContext { WideString m_codewords; FX_STRSIZE m_pos; int32_t m_newEncoding; - CFX_UnownedPtr<CBC_SymbolInfo> m_symbolInfo; + UnownedPtr<CBC_SymbolInfo> m_symbolInfo; private: FX_STRSIZE getTotalMessageCharCount(); diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h index 880f60f0b8..5c9ef09e4d 100644 --- a/fxbarcode/oned/BC_OneDimWriter.h +++ b/fxbarcode/oned/BC_OneDimWriter.h @@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "core/fxge/cfx_renderdevice.h" #include "fxbarcode/BC_Library.h" #include "fxbarcode/BC_Writer.h" @@ -86,7 +86,7 @@ class CBC_OneDimWriter : public CBC_Writer { bool m_bPrintChecksum; int32_t m_iDataLenth; bool m_bCalcChecksum; - CFX_UnownedPtr<CFX_Font> m_pFont; + UnownedPtr<CFX_Font> m_pFont; float m_fFontSize; int32_t m_iFontStyle; uint32_t m_fontColor; diff --git a/fxbarcode/qrcode/BC_QRCoder.h b/fxbarcode/qrcode/BC_QRCoder.h index fe34b5250b..af53ded49d 100644 --- a/fxbarcode/qrcode/BC_QRCoder.h +++ b/fxbarcode/qrcode/BC_QRCoder.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CBC_QRCoderErrorCorrectionLevel; class CBC_QRCoderMode; @@ -50,8 +50,8 @@ class CBC_QRCoder { void SetMatrix(std::unique_ptr<CBC_CommonByteMatrix> pMatrix); private: - CFX_UnownedPtr<CBC_QRCoderMode> m_mode; - CFX_UnownedPtr<const CBC_QRCoderErrorCorrectionLevel> m_ecLevel; + UnownedPtr<CBC_QRCoderMode> m_mode; + UnownedPtr<const CBC_QRCoderErrorCorrectionLevel> m_ecLevel; int32_t m_version; int32_t m_matrixWidth; int32_t m_maskPattern; diff --git a/fxjs/cfxjse_arguments.h b/fxjs/cfxjse_arguments.h index 0553335535..92a36c842e 100644 --- a/fxjs/cfxjse_arguments.h +++ b/fxjs/cfxjse_arguments.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fxjs/cfxjse_class.h" #include "fxjs/fxjse.h" @@ -31,7 +31,7 @@ class CFXJSE_Arguments { private: const v8::FunctionCallbackInfo<v8::Value>* m_pInfo; - CFX_UnownedPtr<CFXJSE_Value> m_pRetValue; + UnownedPtr<CFXJSE_Value> m_pRetValue; }; #endif // FXJS_CFXJSE_ARGUMENTS_H_ diff --git a/fxjs/cfxjse_class.h b/fxjs/cfxjse_class.h index 01becfcf60..056525f30b 100644 --- a/fxjs/cfxjse_class.h +++ b/fxjs/cfxjse_class.h @@ -7,7 +7,7 @@ #ifndef FXJS_CFXJSE_CLASS_H_ #define FXJS_CFXJSE_CLASS_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "fxjs/fxjse.h" #include "v8/include/v8.h" @@ -33,8 +33,8 @@ class CFXJSE_Class { protected: ByteString m_szClassName; - CFX_UnownedPtr<const FXJSE_CLASS_DESCRIPTOR> m_lpClassDefinition; - CFX_UnownedPtr<CFXJSE_Context> m_pContext; + UnownedPtr<const FXJSE_CLASS_DESCRIPTOR> m_lpClassDefinition; + UnownedPtr<CFXJSE_Context> m_pContext; v8::Global<v8::FunctionTemplate> m_hTemplate; friend class CFXJSE_Context; friend class CFXJSE_Value; diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp index bef7597b52..ad6dbac0ad 100644 --- a/fxjs/cfxjse_context.cpp +++ b/fxjs/cfxjse_context.cpp @@ -68,7 +68,7 @@ class CFXJSE_ScopeUtil_IsolateHandleContext { void* operator new(size_t size) = delete; void operator delete(void*, size_t) = delete; - CFX_UnownedPtr<CFXJSE_Context> m_context; + UnownedPtr<CFXJSE_Context> m_context; CFXJSE_ScopeUtil_IsolateHandle m_parent; v8::Context::Scope m_cscope; }; diff --git a/xfa/fde/cfde_texteditengine.cpp b/xfa/fde/cfde_texteditengine.cpp index d54126f3c3..a240132ec0 100644 --- a/xfa/fde/cfde_texteditengine.cpp +++ b/xfa/fde/cfde_texteditengine.cpp @@ -38,7 +38,7 @@ class InsertOperation : public CFDE_TextEditEngine::Operation { } private: - CFX_UnownedPtr<CFDE_TextEditEngine> engine_; + UnownedPtr<CFDE_TextEditEngine> engine_; size_t start_idx_; WideString added_text_; }; @@ -63,7 +63,7 @@ class DeleteOperation : public CFDE_TextEditEngine::Operation { } private: - CFX_UnownedPtr<CFDE_TextEditEngine> engine_; + UnownedPtr<CFDE_TextEditEngine> engine_; size_t start_idx_; WideString removed_text_; }; diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h index 7b739be711..43cfe0c0d3 100644 --- a/xfa/fde/cfde_texteditengine.h +++ b/xfa/fde/cfde_texteditengine.h @@ -49,7 +49,7 @@ class CFDE_TextEditEngine { bool IsEOF(bool bPrev) const; private: - CFX_UnownedPtr<const CFDE_TextEditEngine> engine_; + UnownedPtr<const CFDE_TextEditEngine> engine_; int32_t current_position_; }; @@ -200,7 +200,7 @@ class CFDE_TextEditEngine { }; CFX_RectF contents_bounding_box_; - CFX_UnownedPtr<Delegate> delegate_; + UnownedPtr<Delegate> delegate_; std::vector<FDE_TEXTEDITPIECE> text_piece_info_; std::vector<size_t> char_widths_; CFX_TxtBreak text_break_; diff --git a/xfa/fgas/font/cfgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h index f88f8b4cd9..9df9ea842d 100644 --- a/xfa/fgas/font/cfgas_gefont.h +++ b/xfa/fgas/font/cfgas_gefont.h @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_pdffontmgr.h" diff --git a/xfa/fgas/font/cfgas_pdffontmgr.h b/xfa/fgas/font/cfgas_pdffontmgr.h index 1f7d49a4e7..410aa009b0 100644 --- a/xfa/fgas/font/cfgas_pdffontmgr.h +++ b/xfa/fgas/font/cfgas_pdffontmgr.h @@ -50,8 +50,8 @@ class CFGAS_PDFFontMgr : public Observable<CFGAS_PDFFontMgr> { const ByteString& bsDRFontName, bool bStrictMatch); - CFX_UnownedPtr<CPDF_Document> const m_pDoc; - CFX_UnownedPtr<CFGAS_FontMgr> const m_pFontMgr; + UnownedPtr<CPDF_Document> const m_pDoc; + UnownedPtr<CFGAS_FontMgr> const m_pFontMgr; std::map<RetainPtr<CFGAS_GEFont>, CPDF_Font*> m_FDE2PDFFont; std::map<ByteString, RetainPtr<CFGAS_GEFont>> m_FontMap; }; diff --git a/xfa/fgas/layout/cfx_breakpiece.h b/xfa/fgas/layout/cfx_breakpiece.h index 1109e2296b..5dbc0e7722 100644 --- a/xfa/fgas/layout/cfx_breakpiece.h +++ b/xfa/fgas/layout/cfx_breakpiece.h @@ -10,9 +10,9 @@ #include <vector> #include "core/fxcrt/cfx_char.h" -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fxfa/cxfa_textuserdata.h" class CFX_BreakPiece { @@ -40,7 +40,7 @@ class CFX_BreakPiece { int32_t m_iVerticalScale; uint32_t m_dwIdentity; uint32_t m_dwCharStyles; - CFX_UnownedPtr<std::vector<CFX_Char>> m_pChars; + UnownedPtr<std::vector<CFX_Char>> m_pChars; RetainPtr<CXFA_TextUserData> m_pUserData; }; diff --git a/xfa/fwl/cfwl_app.h b/xfa/fwl/cfwl_app.h index 04f140f451..ed47149a56 100644 --- a/xfa/fwl/cfwl_app.h +++ b/xfa/fwl/cfwl_app.h @@ -37,7 +37,7 @@ class CFWL_App { CFWL_NoteDriver* GetNoteDriver() const { return m_pNoteDriver.get(); } private: - CFX_UnownedPtr<CXFA_FFApp> const m_pAdapterNative; + UnownedPtr<CXFA_FFApp> const m_pAdapterNative; std::unique_ptr<CFWL_WidgetMgr> m_pWidgetMgr; std::unique_ptr<CFWL_NoteDriver> m_pNoteDriver; }; diff --git a/xfa/fwl/cfwl_caret.h b/xfa/fwl/cfwl_caret.h index 32bc79535a..8a0b54fda0 100644 --- a/xfa/fwl/cfwl_caret.h +++ b/xfa/fwl/cfwl_caret.h @@ -51,7 +51,7 @@ class CFWL_Caret : public CFWL_Widget { const CFX_Matrix* pMatrix); std::unique_ptr<CFWL_Caret::Timer> m_pTimer; - CFX_UnownedPtr<CFWL_TimerInfo> m_pTimerInfo; + UnownedPtr<CFWL_TimerInfo> m_pTimerInfo; }; #endif // XFA_FWL_CFWL_CARET_H_ diff --git a/xfa/fwl/cfwl_timer.h b/xfa/fwl/cfwl_timer.h index 93de009ed1..da1b4437e2 100644 --- a/xfa/fwl/cfwl_timer.h +++ b/xfa/fwl/cfwl_timer.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CFWL_TIMER_H_ #define XFA_FWL_CFWL_TIMER_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CFWL_TimerInfo; class CFWL_Widget; @@ -22,7 +22,7 @@ class CFWL_Timer { CFWL_TimerInfo* StartTimer(uint32_t dwElapse, bool bImmediately); protected: - CFX_UnownedPtr<CFWL_Widget> m_pWidget; + UnownedPtr<CFWL_Widget> m_pWidget; }; #endif // XFA_FWL_CFWL_TIMER_H_ diff --git a/xfa/fwl/cfwl_timerinfo.h b/xfa/fwl/cfwl_timerinfo.h index ae77ef5d59..c58bcff9a9 100644 --- a/xfa/fwl/cfwl_timerinfo.h +++ b/xfa/fwl/cfwl_timerinfo.h @@ -7,8 +7,8 @@ #ifndef XFA_FWL_CFWL_TIMERINFO_H_ #define XFA_FWL_CFWL_TIMERINFO_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class IFWL_AdapterTimerMgr; @@ -20,7 +20,7 @@ class CFWL_TimerInfo { void StopTimer(); private: - CFX_UnownedPtr<IFWL_AdapterTimerMgr> m_pMgr; + UnownedPtr<IFWL_AdapterTimerMgr> m_pMgr; }; #endif // XFA_FWL_CFWL_TIMERINFO_H_ diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index 16a818e708..f4ff63ea29 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h @@ -9,9 +9,9 @@ #include <memory> -#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" #include "xfa/fde/cfde_textout.h" #include "xfa/fwl/cfwl_event.h" #include "xfa/fwl/cfwl_themepart.h" @@ -148,8 +148,8 @@ class CFWL_Widget : public IFWL_WidgetDelegate { IFWL_ThemeProvider* pTheme, const CFX_Matrix& pMatrix); - CFX_UnownedPtr<const CFWL_App> const m_pOwnerApp; - CFX_UnownedPtr<CFWL_WidgetMgr> const m_pWidgetMgr; + UnownedPtr<const CFWL_App> const m_pOwnerApp; + UnownedPtr<CFWL_WidgetMgr> const m_pWidgetMgr; std::unique_ptr<CFWL_WidgetProperties> m_pProperties; CFWL_Widget* m_pOuter; int32_t m_iLock; @@ -184,7 +184,7 @@ class CFWL_Widget : public IFWL_WidgetDelegate { CXFA_FFWidget* m_pLayoutItem; uint32_t m_nEventKey; - CFX_UnownedPtr<IFWL_WidgetDelegate> m_pDelegate; + UnownedPtr<IFWL_WidgetDelegate> m_pDelegate; }; #endif // XFA_FWL_CFWL_WIDGET_H_ diff --git a/xfa/fwl/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h index c7e48a1f60..6f6c39a6f9 100644 --- a/xfa/fwl/cfwl_widgetmgr.h +++ b/xfa/fwl/cfwl_widgetmgr.h @@ -113,7 +113,7 @@ class CFWL_WidgetMgr { uint32_t m_dwCapability; std::map<CFWL_Widget*, std::unique_ptr<Item>> m_mapWidgetItem; - CFX_UnownedPtr<CXFA_FWLAdapterWidgetMgr> const m_pAdapter; + UnownedPtr<CXFA_FWLAdapterWidgetMgr> const m_pAdapter; #if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_) CFX_RectF m_rtScreen; #endif diff --git a/xfa/fxfa/cxfa_ffapp.h b/xfa/fxfa/cxfa_ffapp.h index 857e9c03bb..351ba032a0 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_unowned_ptr.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fwl/cfwl_app.h" #include "xfa/fxfa/fxfa.h" @@ -52,7 +52,7 @@ class CXFA_FFApp { private: std::unique_ptr<CXFA_FFDocHandler> m_pDocHandler; - CFX_UnownedPtr<IXFA_AppProvider> const m_pProvider; + UnownedPtr<IXFA_AppProvider> const m_pProvider; // The fonts stored in the font manager may have been created by the default // font manager. The GEFont::LoadFont call takes the manager as a param and diff --git a/xfa/fxfa/cxfa_ffdoc.h b/xfa/fxfa/cxfa_ffdoc.h index ceec91f7db..c85c951e04 100644 --- a/xfa/fxfa/cxfa_ffdoc.h +++ b/xfa/fxfa/cxfa_ffdoc.h @@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_document_parser.h" @@ -82,12 +82,12 @@ class CXFA_FFDoc { bool bXDP = true); private: - CFX_UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment; + UnownedPtr<IXFA_DocEnvironment> const m_pDocEnvironment; std::unique_ptr<CXFA_DocumentParser> m_pDocumentParser; RetainPtr<IFX_SeekableStream> m_pStream; - CFX_UnownedPtr<CXFA_FFApp> m_pApp; + UnownedPtr<CXFA_FFApp> m_pApp; std::unique_ptr<CXFA_FFNotify> m_pNotify; - CFX_UnownedPtr<CPDF_Document> m_pPDFDoc; + UnownedPtr<CPDF_Document> m_pPDFDoc; std::map<uint32_t, FX_IMAGEDIB_AND_DPI> m_HashToDibDpiMap; std::unique_ptr<CXFA_FFDocView> m_DocView; std::unique_ptr<CFGAS_PDFFontMgr> m_pPDFFontMgr; diff --git a/xfa/fxfa/cxfa_ffdocview.h b/xfa/fxfa/cxfa_ffdocview.h index 981491c60a..067b41165a 100644 --- a/xfa/fxfa/cxfa_ffdocview.h +++ b/xfa/fxfa/cxfa_ffdocview.h @@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/cxfa_ffdoc.h" @@ -116,12 +116,12 @@ class CXFA_FFDocView { bool ResetSingleWidgetAccData(CXFA_WidgetAcc* pWidgetAcc); CXFA_Node* GetRootSubform(); - CFX_UnownedPtr<CXFA_FFDoc> const m_pDoc; + UnownedPtr<CXFA_FFDoc> const m_pDoc; std::unique_ptr<CXFA_FFWidgetHandler> m_pWidgetHandler; CXFA_LayoutProcessor* m_pXFADocLayout; // Not owned. - CFX_UnownedPtr<CXFA_WidgetAcc> m_pFocusAcc; - CFX_UnownedPtr<CXFA_FFWidget> m_pFocusWidget; - CFX_UnownedPtr<CXFA_FFWidget> m_pOldFocusWidget; + UnownedPtr<CXFA_WidgetAcc> m_pFocusAcc; + UnownedPtr<CXFA_FFWidget> m_pFocusWidget; + UnownedPtr<CXFA_FFWidget> m_pOldFocusWidget; std::map<CXFA_FFPageView*, std::unique_ptr<CFX_RectF>> m_mapPageInvalidate; std::vector<CXFA_WidgetAcc*> m_ValidateAccs; std::vector<CXFA_WidgetAcc*> m_CalculateAccs; diff --git a/xfa/fxfa/cxfa_ffnotify.h b/xfa/fxfa/cxfa_ffnotify.h index 01adc33c1c..0a95e39451 100644 --- a/xfa/fxfa/cxfa_ffnotify.h +++ b/xfa/fxfa/cxfa_ffnotify.h @@ -71,7 +71,7 @@ class CXFA_FFNotify { void SetFocusWidgetNode(CXFA_Node* pNode); private: - CFX_UnownedPtr<CXFA_FFDoc> const m_pDoc; + UnownedPtr<CXFA_FFDoc> const m_pDoc; }; #endif // XFA_FXFA_CXFA_FFNOTIFY_H_ diff --git a/xfa/fxfa/cxfa_ffpageview.h b/xfa/fxfa/cxfa_ffpageview.h index 4e79ad5e3c..f99788505f 100644 --- a/xfa/fxfa/cxfa_ffpageview.h +++ b/xfa/fxfa/cxfa_ffpageview.h @@ -31,7 +31,7 @@ class CXFA_FFPageView : public CXFA_ContainerLayoutItem { uint32_t dwWidgetFilter); protected: - CFX_UnownedPtr<CXFA_FFDocView> const m_pDocView; + UnownedPtr<CXFA_FFDocView> const m_pDocView; }; using CXFA_LayoutItemIterator = @@ -72,7 +72,7 @@ class CXFA_TabParam { const std::vector<CXFA_FFWidget*>& GetChildren() const { return m_Children; } private: - CFX_UnownedPtr<CXFA_FFWidget> const m_pWidget; + UnownedPtr<CXFA_FFWidget> const m_pWidget; std::vector<CXFA_FFWidget*> m_Children; }; diff --git a/xfa/fxfa/cxfa_ffwidget.h b/xfa/fxfa/cxfa_ffwidget.h index c743742890..77f6faf499 100644 --- a/xfa/fxfa/cxfa_ffwidget.h +++ b/xfa/fxfa/cxfa_ffwidget.h @@ -184,7 +184,7 @@ class CXFA_FFWidget : public CXFA_ContentLayoutItem { CXFA_FFDocView* m_pDocView; CXFA_FFPageView* m_pPageView; - CFX_UnownedPtr<CXFA_WidgetAcc> const m_pDataAcc; + UnownedPtr<CXFA_WidgetAcc> const m_pDataAcc; mutable CFX_RectF m_rtWidget; }; diff --git a/xfa/fxfa/cxfa_fwltheme.h b/xfa/fxfa/cxfa_fwltheme.h index 7813545447..bdab7cfdc5 100644 --- a/xfa/fxfa/cxfa_fwltheme.h +++ b/xfa/fxfa/cxfa_fwltheme.h @@ -60,7 +60,7 @@ class CXFA_FWLTheme final : public IFWL_ThemeProvider { std::unique_ptr<CFDE_TextOut> m_pTextOut; RetainPtr<CFGAS_GEFont> m_pCalendarFont; WideString m_wsResource; - CFX_UnownedPtr<CXFA_FFApp> const m_pApp; + UnownedPtr<CXFA_FFApp> const m_pApp; CFX_RectF m_Rect; }; diff --git a/xfa/fxfa/cxfa_widgetacciterator.h b/xfa/fxfa/cxfa_widgetacciterator.h index 0ad94260f3..79860a4c4c 100644 --- a/xfa/fxfa/cxfa_widgetacciterator.h +++ b/xfa/fxfa/cxfa_widgetacciterator.h @@ -7,7 +7,7 @@ #ifndef XFA_FXFA_CXFA_WIDGETACCITERATOR_H_ #define XFA_FXFA_CXFA_WIDGETACCITERATOR_H_ -#include "core/fxcrt/cfx_unowned_ptr.h" +#include "core/fxcrt/unowned_ptr.h" #include "xfa/fxfa/parser/cxfa_traversestrategy_xfacontainernode.h" class CXFA_Node; @@ -23,7 +23,7 @@ class CXFA_WidgetAccIterator { private: CXFA_ContainerIterator m_ContentIterator; - CFX_UnownedPtr<CXFA_WidgetAcc> m_pCurWidgetAcc; + UnownedPtr<CXFA_WidgetAcc> m_pCurWidgetAcc; }; #endif // XFA_FXFA_CXFA_WIDGETACCITERATOR_H_ diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext.h b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h index ca52ea8271..8d1b33bf81 100644 --- a/xfa/fxfa/fm2js/cxfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext.h @@ -439,7 +439,7 @@ class CXFA_FM2JSContext : public CFXJSE_HostObject { v8::Isolate* m_pIsolate; CFXJSE_Class* m_pFMClass; std::unique_ptr<CFXJSE_Value> m_pValue; - CFX_UnownedPtr<CXFA_Document> const m_pDocument; + UnownedPtr<CXFA_Document> const m_pDocument; }; #endif // XFA_FXFA_FM2JS_CXFA_FM2JSCONTEXT_H_ diff --git a/xfa/fxfa/parser/cxfa_dataexporter.h b/xfa/fxfa/parser/cxfa_dataexporter.h index 0820560c87..a2a55b3c13 100644 --- a/xfa/fxfa/parser/cxfa_dataexporter.h +++ b/xfa/fxfa/parser/cxfa_dataexporter.h @@ -32,7 +32,7 @@ class CXFA_DataExporter { uint32_t dwFlag, const char* pChecksum); - CFX_UnownedPtr<CXFA_Document> const m_pDocument; + UnownedPtr<CXFA_Document> const m_pDocument; }; #endif // XFA_FXFA_PARSER_CXFA_DATAEXPORTER_H_ diff --git a/xfa/fxfa/parser/cxfa_dataimporter.h b/xfa/fxfa/parser/cxfa_dataimporter.h index dc7764ccad..ca5896eb55 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_unowned_ptr.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" +#include "core/fxcrt/unowned_ptr.h" class CXFA_Document; class IFX_SeekableStream; @@ -22,7 +22,7 @@ class CXFA_DataImporter { bool ImportData(const RetainPtr<IFX_SeekableStream>& pDataDocument); private: - CFX_UnownedPtr<CXFA_Document> const m_pDocument; + UnownedPtr<CXFA_Document> const m_pDocument; }; #endif // XFA_FXFA_PARSER_CXFA_DATAIMPORTER_H_ diff --git a/xfa/fxfa/parser/cxfa_layoutprocessor.h b/xfa/fxfa/parser/cxfa_layoutprocessor.h index 360a9df685..e8391bebb9 100644 --- a/xfa/fxfa/parser/cxfa_layoutprocessor.h +++ b/xfa/fxfa/parser/cxfa_layoutprocessor.h @@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/unowned_ptr.h" class CXFA_ContainerLayoutItem; class CXFA_Document; @@ -45,7 +45,7 @@ class CXFA_LayoutProcessor { private: bool IsNeedLayout(); - CFX_UnownedPtr<CXFA_Document> const m_pDocument; + UnownedPtr<CXFA_Document> const m_pDocument; std::unique_ptr<CXFA_ItemLayoutProcessor> m_pRootItemLayoutProcessor; std::unique_ptr<CXFA_LayoutPageMgr> m_pLayoutPageMgr; std::vector<CXFA_Node*> m_rgChangedContainers; diff --git a/xfa/fxfa/parser/cxfa_nodelocale.h b/xfa/fxfa/parser/cxfa_nodelocale.h index 5ad0d4c626..6f79e4a65a 100644 --- a/xfa/fxfa/parser/cxfa_nodelocale.h +++ b/xfa/fxfa/parser/cxfa_nodelocale.h @@ -45,7 +45,7 @@ class CXFA_NodeLocale : public IFX_Locale { int index, bool bAbbr) const; - CFX_UnownedPtr<CXFA_Node> const m_pLocale; + UnownedPtr<CXFA_Node> const m_pLocale; }; #endif // XFA_FXFA_PARSER_CXFA_NODELOCALE_H_ diff --git a/xfa/fxfa/parser/cxfa_object.h b/xfa/fxfa/parser/cxfa_object.h index 49442d254d..3e305008b7 100644 --- a/xfa/fxfa/parser/cxfa_object.h +++ b/xfa/fxfa/parser/cxfa_object.h @@ -86,7 +86,7 @@ class CXFA_Object : public CFXJSE_HostObject { protected: void ThrowException(const wchar_t* str, ...) const; - CFX_UnownedPtr<CXFA_Document> const m_pDocument; + UnownedPtr<CXFA_Document> const m_pDocument; const XFA_ObjectType m_objectType; const XFA_Element m_elementType; diff --git a/xfa/fxfa/parser/cxfa_scriptcontext.h b/xfa/fxfa/parser/cxfa_scriptcontext.h index d3632e2859..75d30278bd 100644 --- a/xfa/fxfa/parser/cxfa_scriptcontext.h +++ b/xfa/fxfa/parser/cxfa_scriptcontext.h @@ -103,7 +103,7 @@ class CXFA_ScriptContext { void DefineJsClass(); void RemoveBuiltInObjs(CFXJSE_Context* pContext) const; - CFX_UnownedPtr<CXFA_Document> const m_pDocument; + UnownedPtr<CXFA_Document> const m_pDocument; std::unique_ptr<CFXJSE_Context> m_JsContext; v8::Isolate* m_pIsolate; CFXJSE_Class* m_pJsClass; |