From aee0db0e6a12bdaacebeb8fb791f4e0d45e18a0d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 21 Sep 2017 16:53:58 -0400 Subject: Move CFX_UnownedPtr to UnownedPtr This CL moves CFX_UnownedPtr to UnownedPtr and places in the fxcrt namespace. Bug: pdfium:898 Change-Id: I6d1fa463f365e5cb3aafa8c8a7a5f7eff62ed8e0 Reviewed-on: https://pdfium-review.googlesource.com/14620 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fxge/agg/fx_agg_driver.cpp | 2 +- core/fxge/android/cfpf_skiafont.h | 6 +++--- core/fxge/android/cfx_androidfontinfo.h | 4 ++-- core/fxge/cfx_facecache.h | 2 +- core/fxge/cfx_folderfontinfo.h | 4 ++-- core/fxge/cfx_fontmapper.h | 2 +- core/fxge/cfx_renderdevice.h | 4 ++-- core/fxge/dib/cfx_bitmapcomposer.h | 4 ++-- core/fxge/dib/cfx_imagerenderer.h | 4 ++-- core/fxge/dib/cfx_imagestretcher.h | 4 ++-- core/fxge/dib/cfx_imagetransformer.h | 4 ++-- core/fxge/dib/cstretchengine.h | 4 ++-- core/fxge/fx_font.h | 4 ++-- core/fxge/skia/fx_skia_device.cpp | 6 +++--- core/fxge/win32/cfx_psrenderer.cpp | 2 +- core/fxge/win32/fx_win32_device.cpp | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) (limited to 'core/fxge') 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 m_pOriDevice; RetainPtr m_pClipMask; RetainPtr m_pDevice; - CFX_UnownedPtr m_pClipRgn; + UnownedPtr 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 m_pFontMgr; - CFX_UnownedPtr m_pFontDes; + UnownedPtr m_pFontMgr; + UnownedPtr 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 m_pFontMgr; + UnownedPtr 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 #include -#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 #include -#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> m_FontList; std::vector m_PathList; - CFX_UnownedPtr m_pMapper; + UnownedPtr 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 m_FaceArray; std::unique_ptr m_pFontInfo; FXFT_Face m_FoxitFaces[FOXIT_FACE_COUNT]; - CFX_UnownedPtr const m_pFontMgr; + UnownedPtr 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 -#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 m_pDevice; + UnownedPtr 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 -#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 m_pBitmap; - CFX_UnownedPtr m_pClipRgn; + UnownedPtr 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 -#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 m_pDevice; - const CFX_UnownedPtr m_pClipRgn; + const UnownedPtr 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 -#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 const m_pDest; + UnownedPtr const m_pDest; RetainPtr m_pSource; std::unique_ptr m_pStretchEngine; std::unique_ptr 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 -#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 m_pSrc; - CFX_UnownedPtr const m_pMatrix; + UnownedPtr 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 -#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 m_pDestBitmap; + UnownedPtr 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 #include -#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 m_FaceCache; + mutable UnownedPtr m_FaceCache; std::unique_ptr m_pSubstFont; std::vector 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 driver) { + static int AggSaveCount(const UnownedPtr 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 m_pDriver; - CFX_UnownedPtr m_pTypeFace; + UnownedPtr m_pDriver; + UnownedPtr 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 m_pFont; + UnownedPtr 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 m_pMapper; + UnownedPtr m_pMapper; ByteString m_LastFamily; ByteString m_KaiTi, m_FangSong; }; -- cgit v1.2.3