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/fxcrt | |
| 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/fxcrt')
| -rw-r--r-- | core/fxcrt/cfx_seekablestreamproxy.h | 1 | ||||
| -rw-r--r-- | core/fxcrt/css/cfx_csscomputedstyle.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/fxcrt/cfx_seekablestreamproxy.h b/core/fxcrt/cfx_seekablestreamproxy.h index d389baf13f..9b6b3a11c9 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.h +++ b/core/fxcrt/cfx_seekablestreamproxy.h @@ -23,6 +23,7 @@ class CFX_SeekableStreamProxy : public IFX_SeekableReadStream { template <typename T, typename... Args> friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); + // IFX_SeekableReadStream: FX_FILESIZE GetSize() override; FX_FILESIZE GetPosition() override; bool IsEOF() override; diff --git a/core/fxcrt/css/cfx_csscomputedstyle.h b/core/fxcrt/css/cfx_csscomputedstyle.h index 4b44a6d87c..5080a7a3c2 100644 --- a/core/fxcrt/css/cfx_csscomputedstyle.h +++ b/core/fxcrt/css/cfx_csscomputedstyle.h @@ -55,6 +55,9 @@ class CFX_CSSComputedStyle : public Retainable { bool m_bHasPadding; }; + template <typename T, typename... Args> + friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); + int32_t CountFontFamilies() const; const WideString GetFontFamily(int32_t index) const; uint16_t GetFontWeight() const; @@ -97,9 +100,6 @@ class CFX_CSSComputedStyle : public Retainable { NonInheritedData m_NonInheritedData; private: - template <typename T, typename... Args> - friend RetainPtr<T> pdfium::MakeRetain(Args&&... args); - CFX_CSSComputedStyle(); ~CFX_CSSComputedStyle() override; |