summaryrefslogtreecommitdiff
path: root/core/fpdfapi
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-21 16:53:58 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-21 21:25:26 +0000
commitaee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d (patch)
tree1e14d60adcffeb0791a0a6c8792d3e9c0109384e /core/fpdfapi
parent8e9e3d8975eeea3429c3b3ea703f04ac34e20e28 (diff)
downloadpdfium-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>
Diffstat (limited to 'core/fpdfapi')
-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
49 files changed, 138 insertions, 138 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;
};