diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 15:49:49 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 20:17:31 +0000 |
| commit | 0b95042db2e6dab5876abd12ce485fff0a8e08fe (patch) | |
| tree | 02132ed53945fde30bfbf230ff4e9b5308dd7732 /core/fxge/dib/cfx_dibsource.h | |
| parent | a5eb9f05b7c3f82630784e043ccf75c4e019b18f (diff) | |
| download | pdfium-0b95042db2e6dab5876abd12ce485fff0a8e08fe.tar.xz | |
Rename CFX_RetainPtr to RetainPtr
This CL renames CFX_RetainPtr to RetainPtr and places in the fxcrt
namespace.
Bug: pdfium:898
Change-Id: I8798a9f79cb0840d3f037e8d04937cedd742914e
Reviewed-on: https://pdfium-review.googlesource.com/14616
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/dib/cfx_dibsource.h')
| -rw-r--r-- | core/fxge/dib/cfx_dibsource.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/fxge/dib/cfx_dibsource.h b/core/fxge/dib/cfx_dibsource.h index 2315318ccb..e2cdfa61ad 100644 --- a/core/fxge/dib/cfx_dibsource.h +++ b/core/fxge/dib/cfx_dibsource.h @@ -9,9 +9,9 @@ #include <memory> -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_memory.h" +#include "core/fxcrt/retain_ptr.h" #include "core/fxge/fx_dib.h" enum FXDIB_Channel { @@ -29,7 +29,7 @@ class CFX_ClipRgn; class CFX_DIBitmap; class IFX_PauseIndicator; -class CFX_DIBSource : public CFX_Retainable { +class CFX_DIBSource : public Retainable { public: ~CFX_DIBSource() override; @@ -72,22 +72,22 @@ class CFX_DIBSource : public CFX_Retainable { // Copies into internally-owned palette. void SetPalette(const uint32_t* pSrcPal); - CFX_RetainPtr<CFX_DIBitmap> Clone(const FX_RECT* pClip) const; - CFX_RetainPtr<CFX_DIBitmap> CloneConvert(FXDIB_Format format); - CFX_RetainPtr<CFX_DIBitmap> StretchTo(int dest_width, - int dest_height, - uint32_t flags, - const FX_RECT* pClip); - CFX_RetainPtr<CFX_DIBitmap> TransformTo(const CFX_Matrix* pMatrix, - int* left, - int* top); - CFX_RetainPtr<CFX_DIBitmap> SwapXY(bool bXFlip, bool bYFlip) const; - CFX_RetainPtr<CFX_DIBitmap> FlipImage(bool bXFlip, bool bYFlip) const; + RetainPtr<CFX_DIBitmap> Clone(const FX_RECT* pClip) const; + RetainPtr<CFX_DIBitmap> CloneConvert(FXDIB_Format format); + RetainPtr<CFX_DIBitmap> StretchTo(int dest_width, + int dest_height, + uint32_t flags, + const FX_RECT* pClip); + RetainPtr<CFX_DIBitmap> TransformTo(const CFX_Matrix* pMatrix, + int* left, + int* top); + RetainPtr<CFX_DIBitmap> SwapXY(bool bXFlip, bool bYFlip) const; + RetainPtr<CFX_DIBitmap> FlipImage(bool bXFlip, bool bYFlip) const; - CFX_RetainPtr<CFX_DIBitmap> CloneAlphaMask() const; + RetainPtr<CFX_DIBitmap> CloneAlphaMask() const; // Copies into internally-owned mask. - bool SetAlphaMask(const CFX_RetainPtr<CFX_DIBSource>& pAlphaMask, + bool SetAlphaMask(const RetainPtr<CFX_DIBSource>& pAlphaMask, const FX_RECT* pClip); void GetOverlapRect(int& dest_left, @@ -104,7 +104,7 @@ class CFX_DIBSource : public CFX_Retainable { void DebugVerifyBitmapIsPreMultiplied(void* buffer) const; #endif - CFX_RetainPtr<CFX_DIBitmap> m_pAlphaMask; + RetainPtr<CFX_DIBitmap> m_pAlphaMask; protected: CFX_DIBSource(); @@ -114,7 +114,7 @@ class CFX_DIBSource : public CFX_Retainable { int dest_pitch, int width, int height, - const CFX_RetainPtr<CFX_DIBSource>& pSrcBitmap, + const RetainPtr<CFX_DIBSource>& pSrcBitmap, int src_left, int src_top, std::unique_ptr<uint32_t, FxFreeDeleter>* pal); |