diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-22 22:06:49 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-22 22:06:49 +0000 |
| commit | 86688dea3b0d30741a95fd15b5f9ee57b2ae86f1 (patch) | |
| tree | a858f201cdc8d0823496dcfcf15d22bff1c402a8 /core/fxge | |
| parent | 96c9517296c94cfa643d6197c8227879d88876d9 (diff) | |
| download | pdfium-86688dea3b0d30741a95fd15b5f9ee57b2ae86f1.tar.xz | |
Make friend RetainPtr<T> statements consistently public.
Also make destructors private for RetainPtr sub-classes, and add missing
destructors.
Change-Id: I451bf0aae2dae943b1f450d0aa4ca5124dc578fd
Reviewed-on: https://pdfium-review.googlesource.com/32853
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/dib/cfx_dibitmap.h | 3 | ||||
| -rw-r--r-- | core/fxge/dib/cfx_filtereddib.h | 3 | ||||
| -rw-r--r-- | core/fxge/win32/cfx_windowsdib.h | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h index 105a22d76e..008a549bac 100644 --- a/core/fxge/dib/cfx_dibitmap.h +++ b/core/fxge/dib/cfx_dibitmap.h @@ -18,8 +18,6 @@ class CFX_DIBitmap : public CFX_DIBSource { template <typename T, typename... Args> friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); - ~CFX_DIBitmap() override; - bool Create(int width, int height, FXDIB_Format format, @@ -111,6 +109,7 @@ class CFX_DIBitmap : public CFX_DIBSource { protected: CFX_DIBitmap(); CFX_DIBitmap(const CFX_DIBitmap& src); + ~CFX_DIBitmap() override; #if defined _SKIA_SUPPORT_PATHS_ enum class Format { kCleared, kPreMultiplied, kUnPreMultiplied }; diff --git a/core/fxge/dib/cfx_filtereddib.h b/core/fxge/dib/cfx_filtereddib.h index e998c7169a..9c1efa544d 100644 --- a/core/fxge/dib/cfx_filtereddib.h +++ b/core/fxge/dib/cfx_filtereddib.h @@ -17,8 +17,6 @@ class CFX_FilteredDIB : public CFX_DIBSource { template <typename T, typename... Args> friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); - ~CFX_FilteredDIB() override; - virtual FXDIB_Format GetDestFormat() = 0; virtual uint32_t* GetDestPalette() = 0; virtual void TranslateScanline(const uint8_t* src_buf, @@ -32,6 +30,7 @@ class CFX_FilteredDIB : public CFX_DIBSource { protected: CFX_FilteredDIB(); + ~CFX_FilteredDIB() override; // CFX_DIBSource const uint8_t* GetScanline(int line) const override; diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h index 7c2447ded2..3120b8f543 100644 --- a/core/fxge/win32/cfx_windowsdib.h +++ b/core/fxge/win32/cfx_windowsdib.h @@ -32,8 +32,6 @@ class CFX_WindowsDIB : public CFX_DIBitmap { template <typename T, typename... Args> friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); - ~CFX_WindowsDIB() override; - static ByteString GetBitmapInfo(const RetainPtr<CFX_DIBitmap>& pBitmap); static HBITMAP GetDDBitmap(const RetainPtr<CFX_DIBitmap>& pBitmap, HDC hDC); @@ -49,6 +47,7 @@ class CFX_WindowsDIB : public CFX_DIBitmap { protected: CFX_WindowsDIB(HDC hDC, int width, int height); + ~CFX_WindowsDIB() override; HDC m_hMemDC; HBITMAP m_hBitmap; |