diff options
| author | Tom Sepez <tsepez@chromium.org> | 2017-03-28 09:31:32 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-28 16:42:55 +0000 |
| commit | f0799fe84df4d86f25d342b03525f3016d674f86 (patch) | |
| tree | d6839802a68b7b6ad6fb166179ede779c3560c75 /core/fxge/cfx_fxgedevice.h | |
| parent | 31b08d4cdaa17d7a03f35e087096a77036af98ec (diff) | |
| download | pdfium-f0799fe84df4d86f25d342b03525f3016d674f86.tar.xz | |
Revert "Revert "Refcount all CFX_DIBSources (and subclasses) all the time.""
This reverts commit 31b08d4cdaa17d7a03f35e087096a77036af98ec.
Re-landing the patch after fixing skia build issue.
Change-Id: Ie7039890088b803a6ec5ce365d70f57277459b48
Reviewed-on: https://pdfium-review.googlesource.com/3245
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxge/cfx_fxgedevice.h')
| -rw-r--r-- | core/fxge/cfx_fxgedevice.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/core/fxge/cfx_fxgedevice.h b/core/fxge/cfx_fxgedevice.h index 8358e43666..4e8a7f4f55 100644 --- a/core/fxge/cfx_fxgedevice.h +++ b/core/fxge/cfx_fxgedevice.h @@ -17,30 +17,27 @@ class CFX_FxgeDevice : public CFX_RenderDevice { CFX_FxgeDevice(); ~CFX_FxgeDevice() override; - bool Attach(CFX_DIBitmap* pBitmap, + bool Attach(const CFX_RetainPtr<CFX_DIBitmap>& pBitmap, bool bRgbByteOrder, - CFX_DIBitmap* pOriDevice, + const CFX_RetainPtr<CFX_DIBitmap>& pOriDevice, bool bGroupKnockout); bool Create(int width, int height, FXDIB_Format format, - CFX_DIBitmap* pOriDevice); + const CFX_RetainPtr<CFX_DIBitmap>& pOriDevice); #ifdef _SKIA_SUPPORT_ bool AttachRecorder(SkPictureRecorder* recorder); void Clear(uint32_t color); SkPictureRecorder* CreateRecorder(int size_x, int size_y); void DebugVerifyBitmapIsPreMultiplied() const override; - bool SetBitsWithMask(const CFX_DIBSource* pBitmap, - const CFX_DIBSource* pMask, + bool SetBitsWithMask(const CFX_RetainPtr<CFX_DIBSource>& pBitmap, + const CFX_RetainPtr<CFX_DIBSource>& pMask, int left, int top, int bitmap_alpha, int blend_type) override; #endif - - private: - bool m_bOwnedBitmap; }; #endif // CORE_FXGE_CFX_FXGEDEVICE_H_ |