summaryrefslogtreecommitdiff
path: root/core/fpdfapi/render
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-05-22 22:06:49 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-05-22 22:06:49 +0000
commit86688dea3b0d30741a95fd15b5f9ee57b2ae86f1 (patch)
treea858f201cdc8d0823496dcfcf15d22bff1c402a8 /core/fpdfapi/render
parent96c9517296c94cfa643d6197c8227879d88876d9 (diff)
downloadpdfium-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/fpdfapi/render')
-rw-r--r--core/fpdfapi/render/cpdf_dibsource.h7
-rw-r--r--core/fpdfapi/render/cpdf_dibtransferfunc.h3
2 files changed, 4 insertions, 6 deletions
diff --git a/core/fpdfapi/render/cpdf_dibsource.h b/core/fpdfapi/render/cpdf_dibsource.h
index 4646bf2fe9..50d9c6ef9c 100644
--- a/core/fpdfapi/render/cpdf_dibsource.h
+++ b/core/fpdfapi/render/cpdf_dibsource.h
@@ -41,12 +41,10 @@ struct DIB_COMP_DATA {
class CPDF_DIBSource : public CFX_DIBSource {
public:
- template <typename T, typename... Args>
- friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
-
enum class LoadState : uint8_t { kFail, kSuccess, kContinue };
- ~CPDF_DIBSource() override;
+ template <typename T, typename... Args>
+ friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
bool Load(CPDF_Document* pDoc, const CPDF_Stream* pStream);
@@ -80,6 +78,7 @@ class CPDF_DIBSource : public CFX_DIBSource {
private:
CPDF_DIBSource();
+ ~CPDF_DIBSource() override;
LoadState StartLoadMask();
LoadState StartLoadMaskDIB();
diff --git a/core/fpdfapi/render/cpdf_dibtransferfunc.h b/core/fpdfapi/render/cpdf_dibtransferfunc.h
index 34f5bb1abe..61abd2e23c 100644
--- a/core/fpdfapi/render/cpdf_dibtransferfunc.h
+++ b/core/fpdfapi/render/cpdf_dibtransferfunc.h
@@ -20,8 +20,6 @@ class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
template <typename T, typename... Args>
friend RetainPtr<T> pdfium::MakeRetain(Args&&... args);
- ~CPDF_DIBTransferFunc() override;
-
// CFX_FilteredDIB
FXDIB_Format GetDestFormat() override;
FX_ARGB* GetDestPalette() override;
@@ -35,6 +33,7 @@ class CPDF_DIBTransferFunc : public CFX_FilteredDIB {
private:
explicit CPDF_DIBTransferFunc(
const RetainPtr<CPDF_TransferFunc>& pTransferFunc);
+ ~CPDF_DIBTransferFunc() override;
RetainPtr<CPDF_TransferFunc> m_pTransferFunc;
const uint8_t* m_RampR;