From cb798258c433bec7087948fcbfff14d1e7683006 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 17 Sep 2018 18:25:32 +0000 Subject: Fix final/protected conflicts. Classes marked |final| should not have |protected| members. In turn, "private field m_dwEncryptObjNum is not used" warning is produced. Change-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327 Reviewed-on: https://pdfium-review.googlesource.com/42611 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxge/android/cfx_androidfontinfo.h | 2 +- core/fxge/win32/cfx_windowsdib.h | 2 +- core/fxge/win32/win32_int.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h index f671bfbbb7..86b0d34d62 100644 --- a/core/fxge/android/cfx_androidfontinfo.h +++ b/core/fxge/android/cfx_androidfontinfo.h @@ -37,7 +37,7 @@ class CFX_AndroidFontInfo final : public SystemFontInfoIface { bool GetFontCharset(void* hFont, int* charset) override; void DeleteFont(void* hFont) override; - protected: + private: UnownedPtr m_pFontMgr; }; diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h index 4b7de7d5f9..edc1ed701c 100644 --- a/core/fxge/win32/cfx_windowsdib.h +++ b/core/fxge/win32/cfx_windowsdib.h @@ -42,7 +42,7 @@ class CFX_WindowsDIB final : public CFX_DIBitmap { void LoadFromDevice(HDC hDC, int left, int top); void SetToDevice(HDC hDC, int left, int top); - protected: + private: CFX_WindowsDIB(HDC hDC, int width, int height); ~CFX_WindowsDIB() override; diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index 0bc68c46b9..7b4f9ab246 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -193,7 +193,7 @@ class CGdiDisplayDriver final : public CGdiDeviceDriver { explicit CGdiDisplayDriver(HDC hDC); ~CGdiDisplayDriver() override; - protected: + private: bool GetDIBits(const RetainPtr& pBitmap, int left, int top) override; @@ -234,7 +234,7 @@ class CGdiPrinterDriver final : public CGdiDeviceDriver { explicit CGdiPrinterDriver(HDC hDC); ~CGdiPrinterDriver() override; - protected: + private: int GetDeviceCaps(int caps_id) const override; bool SetDIBits(const RetainPtr& pBitmap, uint32_t color, @@ -274,7 +274,7 @@ class CPSPrinterDriver final : public RenderDeviceDriverIface { CPSPrinterDriver(HDC hDC, WindowsPrintMode mode, bool bCmykOutput); ~CPSPrinterDriver() override; - protected: + private: // RenderDeviceDriverIface int GetDeviceCaps(int caps_id) const override; bool StartRendering() override; @@ -339,7 +339,7 @@ class CTextOnlyPrinterDriver final : public RenderDeviceDriverIface { explicit CTextOnlyPrinterDriver(HDC hDC); ~CTextOnlyPrinterDriver() override; - protected: + private: // RenderDeviceDriverIface int GetDeviceCaps(int caps_id) const override; void SaveState() override{}; -- cgit v1.2.3