summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/edit/cpdf_creator.h10
-rw-r--r--core/fpdfapi/edit/cpdf_pagecontentgenerator.h8
-rw-r--r--core/fpdfapi/font/cpdf_cidfont.h4
-rw-r--r--core/fpdfapi/font/cpdf_cmapparser.h4
-rw-r--r--core/fpdfapi/font/cpdf_font.h4
-rw-r--r--core/fpdfapi/font/cpdf_fontglobals.h2
-rw-r--r--core/fpdfapi/font/cpdf_tounicodemap.h4
-rw-r--r--core/fpdfapi/font/cpdf_type3font.h6
-rw-r--r--core/fpdfapi/page/cpdf_colorspace.cpp2
-rw-r--r--core/fpdfapi/page/cpdf_colorspace.h6
-rw-r--r--core/fpdfapi/page/cpdf_contentmarkitem.h4
-rw-r--r--core/fpdfapi/page/cpdf_contentparser.h6
-rw-r--r--core/fpdfapi/page/cpdf_docpagedata.h4
-rw-r--r--core/fpdfapi/page/cpdf_generalstate.h12
-rw-r--r--core/fpdfapi/page/cpdf_iccprofile.h4
-rw-r--r--core/fpdfapi/page/cpdf_image.h6
-rw-r--r--core/fpdfapi/page/cpdf_meshstream.h4
-rw-r--r--core/fpdfapi/page/cpdf_pageobjectholder.h12
-rw-r--r--core/fpdfapi/page/cpdf_pattern.h6
-rw-r--r--core/fpdfapi/page/cpdf_shadingobject.h4
-rw-r--r--core/fpdfapi/page/cpdf_shadingpattern.h8
-rw-r--r--core/fpdfapi/page/cpdf_streamcontentparser.h14
-rw-r--r--core/fpdfapi/page/cpdf_textstate.h4
-rw-r--r--core/fpdfapi/parser/cfdf_document.h4
-rw-r--r--core/fpdfapi/parser/cpdf_data_avail.cpp2
-rw-r--r--core/fpdfapi/parser/cpdf_data_avail.h4
-rw-r--r--core/fpdfapi/parser/cpdf_document.h2
-rw-r--r--core/fpdfapi/parser/cpdf_hint_tables.h6
-rw-r--r--core/fpdfapi/parser/cpdf_object_avail.h6
-rw-r--r--core/fpdfapi/parser/cpdf_object_unittest.cpp6
-rw-r--r--core/fpdfapi/parser/cpdf_parser.h6
-rw-r--r--core/fpdfapi/parser/cpdf_read_validator.h6
-rw-r--r--core/fpdfapi/parser/cpdf_reference.h4
-rw-r--r--core/fpdfapi/parser/cpdf_security_handler.h4
-rw-r--r--core/fpdfapi/parser/cpdf_stream_acc.h2
-rw-r--r--core/fpdfapi/render/cpdf_devicebuffer.h8
-rw-r--r--core/fpdfapi/render/cpdf_dibsource.h10
-rw-r--r--core/fpdfapi/render/cpdf_docrenderdata.h4
-rw-r--r--core/fpdfapi/render/cpdf_imagecacheentry.h4
-rw-r--r--core/fpdfapi/render/cpdf_imageloader.h6
-rw-r--r--core/fpdfapi/render/cpdf_imagerenderer.h10
-rw-r--r--core/fpdfapi/render/cpdf_pagerendercache.h4
-rw-r--r--core/fpdfapi/render/cpdf_progressiverenderer.h4
-rw-r--r--core/fpdfapi/render/cpdf_rendercontext.h10
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.cpp2
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.h10
-rw-r--r--core/fpdfapi/render/cpdf_scaledrenderbuffer.h8
-rw-r--r--core/fpdfapi/render/cpdf_transferfunc.h4
-rw-r--r--core/fpdfapi/render/cpdf_type3cache.h2
-rw-r--r--core/fpdfdoc/cpdf_aaction.h2
-rw-r--r--core/fpdfdoc/cpdf_action.h2
-rw-r--r--core/fpdfdoc/cpdf_actionfields.h4
-rw-r--r--core/fpdfdoc/cpdf_annot.h2
-rw-r--r--core/fpdfdoc/cpdf_apsettings.h4
-rw-r--r--core/fpdfdoc/cpdf_bookmark.h4
-rw-r--r--core/fpdfdoc/cpdf_bookmarktree.h4
-rw-r--r--core/fpdfdoc/cpdf_dest.h4
-rw-r--r--core/fpdfdoc/cpdf_docjsactions.h4
-rw-r--r--core/fpdfdoc/cpdf_filespec.h4
-rw-r--r--core/fpdfdoc/cpdf_formcontrol.h4
-rw-r--r--core/fpdfdoc/cpdf_formfield.h10
-rw-r--r--core/fpdfdoc/cpdf_iconfit.h4
-rw-r--r--core/fpdfdoc/cpdf_interform.h8
-rw-r--r--core/fpdfdoc/cpdf_link.h4
-rw-r--r--core/fpdfdoc/cpdf_nametree.h4
-rw-r--r--core/fpdfdoc/cpdf_numbertree.h4
-rw-r--r--core/fpdfdoc/cpdf_occontext.h2
-rw-r--r--core/fpdfdoc/cpdf_pagelabel.h2
-rw-r--r--core/fpdfdoc/cpdf_structelement.h10
-rw-r--r--core/fpdfdoc/cpdf_structtree.h8
-rw-r--r--core/fpdfdoc/cpdf_variabletext.h2
-rw-r--r--core/fpdfdoc/cpdf_viewerpreferences.h4
-rw-r--r--core/fpdfdoc/cpvt_fontmap.h10
-rw-r--r--core/fpdfdoc/csection.h2
-rw-r--r--core/fpdfdoc/ctypeset.h4
-rw-r--r--core/fpdftext/cpdf_linkextract.h2
-rw-r--r--core/fpdftext/cpdf_textpage.h12
-rw-r--r--core/fpdftext/cpdf_textpagefind.h4
-rw-r--r--core/fxcodec/codec/ccodec_bmpmodule.cpp2
-rw-r--r--core/fxcodec/codec/ccodec_bmpmodule.h2
-rw-r--r--core/fxcodec/codec/ccodec_pngmodule.cpp6
-rw-r--r--core/fxcodec/codec/ccodec_progressivedecoder.h4
-rw-r--r--core/fxcodec/codec/cjpx_decoder.h4
-rw-r--r--core/fxcodec/jbig2/JBig2_ArithDecoder.h4
-rw-r--r--core/fxcodec/jbig2/JBig2_GrdProc.h2
-rw-r--r--core/fxcodec/jbig2/JBig2_HuffmanDecoder.h4
-rw-r--r--core/fxcodec/lbmp/fx_bmp.h4
-rw-r--r--core/fxcodec/lgif/cgifcontext.h6
-rw-r--r--core/fxcrt/cfx_bitstream.h4
-rw-r--r--core/fxcrt/string_view_template.h4
-rw-r--r--core/fxcrt/unowned_ptr.h (renamed from core/fxcrt/cfx_unowned_ptr.h)42
-rw-r--r--core/fxcrt/unowned_ptr_unittest.cpp (renamed from core/fxcrt/cfx_unowned_ptr_unittest.cpp)41
-rw-r--r--core/fxcrt/xml/cxml_element.h2
-rw-r--r--core/fxge/agg/fx_agg_driver.cpp2
-rw-r--r--core/fxge/android/cfpf_skiafont.h6
-rw-r--r--core/fxge/android/cfx_androidfontinfo.h4
-rw-r--r--core/fxge/cfx_facecache.h2
-rw-r--r--core/fxge/cfx_folderfontinfo.h4
-rw-r--r--core/fxge/cfx_fontmapper.h2
-rw-r--r--core/fxge/cfx_renderdevice.h4
-rw-r--r--core/fxge/dib/cfx_bitmapcomposer.h4
-rw-r--r--core/fxge/dib/cfx_imagerenderer.h4
-rw-r--r--core/fxge/dib/cfx_imagestretcher.h4
-rw-r--r--core/fxge/dib/cfx_imagetransformer.h4
-rw-r--r--core/fxge/dib/cstretchengine.h4
-rw-r--r--core/fxge/fx_font.h4
-rw-r--r--core/fxge/skia/fx_skia_device.cpp6
-rw-r--r--core/fxge/win32/cfx_psrenderer.cpp2
-rw-r--r--core/fxge/win32/fx_win32_device.cpp2
109 files changed, 303 insertions, 296 deletions
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;
};