From 55865454c43fbc3b163cff166544ba0a060dcbc4 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Aug 2018 20:18:04 +0000 Subject: The final game: mark everything final. Then revert the ones that break compilation. Fix one IWYU noticed during presubmit. Change-Id: I881a8a72818e55dbc4816247e35ff5e3015194e7 Reviewed-on: https://pdfium-review.googlesource.com/41470 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxge/agg/fx_agg_driver.h | 2 +- core/fxge/android/cfx_androidfontinfo.h | 2 +- core/fxge/apple/fx_mac_imp.cpp | 2 +- core/fxge/cfx_defaultrenderdevice.h | 2 +- core/fxge/cfx_graphstatedata.h | 2 +- core/fxge/cfx_pathdata.h | 2 +- core/fxge/cfx_unicodeencodingex.h | 2 +- core/fxge/cfx_windowsrenderdevice.h | 2 +- core/fxge/dib/cfx_bitmapcomposer.h | 2 +- core/fxge/dib/cfx_bitmapstorer.h | 2 +- core/fxge/dib/cfx_imagetransformer.cpp | 2 +- core/fxge/fx_ge_linux.cpp | 2 +- core/fxge/skia/fx_skia_device.h | 2 +- core/fxge/win32/cfx_windowsdib.h | 2 +- core/fxge/win32/cpsoutput.h | 2 +- core/fxge/win32/win32_int.h | 8 ++++---- 16 files changed, 19 insertions(+), 19 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/agg/fx_agg_driver.h b/core/fxge/agg/fx_agg_driver.h index 167b211746..6d6b988c3a 100644 --- a/core/fxge/agg/fx_agg_driver.h +++ b/core/fxge/agg/fx_agg_driver.h @@ -30,7 +30,7 @@ class CAgg_PathData { agg::path_storage m_PathData; }; -class CFX_AggDeviceDriver : public RenderDeviceDriverIface { +class CFX_AggDeviceDriver final : public RenderDeviceDriverIface { public: CFX_AggDeviceDriver(const RetainPtr& pBitmap, bool bRgbByteOrder, diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h index 62ad7184fe..f671bfbbb7 100644 --- a/core/fxge/android/cfx_androidfontinfo.h +++ b/core/fxge/android/cfx_androidfontinfo.h @@ -14,7 +14,7 @@ class CFPF_SkiaFontMgr; -class CFX_AndroidFontInfo : public SystemFontInfoIface { +class CFX_AndroidFontInfo final : public SystemFontInfoIface { public: CFX_AndroidFontInfo(); ~CFX_AndroidFontInfo() override; diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index f4a62a62d8..62ac33c51b 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -35,7 +35,7 @@ const struct { {"Times-Italic", "Times New Roman Italic"}, }; -class CFX_MacFontInfo : public CFX_FolderFontInfo { +class CFX_MacFontInfo final : public CFX_FolderFontInfo { public: CFX_MacFontInfo() {} ~CFX_MacFontInfo() override {} diff --git a/core/fxge/cfx_defaultrenderdevice.h b/core/fxge/cfx_defaultrenderdevice.h index 07e3cc57c9..937088f2b2 100644 --- a/core/fxge/cfx_defaultrenderdevice.h +++ b/core/fxge/cfx_defaultrenderdevice.h @@ -12,7 +12,7 @@ class SkPictureRecorder; -class CFX_DefaultRenderDevice : public CFX_RenderDevice { +class CFX_DefaultRenderDevice final : public CFX_RenderDevice { public: CFX_DefaultRenderDevice(); ~CFX_DefaultRenderDevice() override; diff --git a/core/fxge/cfx_graphstatedata.h b/core/fxge/cfx_graphstatedata.h index 1afff83c1c..a907f2a922 100644 --- a/core/fxge/cfx_graphstatedata.h +++ b/core/fxge/cfx_graphstatedata.h @@ -10,7 +10,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" -class CFX_GraphStateData : public Retainable { +class CFX_GraphStateData final : public Retainable { public: enum LineCap { LineCapButt = 0, LineCapRound = 1, LineCapSquare = 2 }; diff --git a/core/fxge/cfx_pathdata.h b/core/fxge/cfx_pathdata.h index 5c2be627bf..9d96407de9 100644 --- a/core/fxge/cfx_pathdata.h +++ b/core/fxge/cfx_pathdata.h @@ -29,7 +29,7 @@ class FX_PATHPOINT { bool m_CloseFigure; }; -class CFX_PathData : public Retainable { +class CFX_PathData final : public Retainable { public: CFX_PathData(); CFX_PathData(const CFX_PathData& src); diff --git a/core/fxge/cfx_unicodeencodingex.h b/core/fxge/cfx_unicodeencodingex.h index 5632d9665d..d9d349a88b 100644 --- a/core/fxge/cfx_unicodeencodingex.h +++ b/core/fxge/cfx_unicodeencodingex.h @@ -15,7 +15,7 @@ #include "core/fxge/cfx_unicodeencoding.h" #include "core/fxge/fx_dib.h" -class CFX_UnicodeEncodingEx : public CFX_UnicodeEncoding { +class CFX_UnicodeEncodingEx final : public CFX_UnicodeEncoding { public: CFX_UnicodeEncodingEx(CFX_Font* pFont, uint32_t EncodingID); ~CFX_UnicodeEncodingEx() override; diff --git a/core/fxge/cfx_windowsrenderdevice.h b/core/fxge/cfx_windowsrenderdevice.h index 9701ca5186..4470a74c45 100644 --- a/core/fxge/cfx_windowsrenderdevice.h +++ b/core/fxge/cfx_windowsrenderdevice.h @@ -36,7 +36,7 @@ extern PDFiumEnsureTypefaceCharactersAccessible #endif extern WindowsPrintMode g_pdfium_print_mode; -class CFX_WindowsRenderDevice : public CFX_RenderDevice { +class CFX_WindowsRenderDevice final : public CFX_RenderDevice { public: static RenderDeviceDriverIface* CreateDriver(HDC hDC); diff --git a/core/fxge/dib/cfx_bitmapcomposer.h b/core/fxge/dib/cfx_bitmapcomposer.h index f1bf0e9f32..50a53dbc2b 100644 --- a/core/fxge/dib/cfx_bitmapcomposer.h +++ b/core/fxge/dib/cfx_bitmapcomposer.h @@ -18,7 +18,7 @@ class CFX_ClipRgn; class CFX_DIBitmap; -class CFX_BitmapComposer : public ScanlineComposerIface { +class CFX_BitmapComposer final : public ScanlineComposerIface { public: CFX_BitmapComposer(); ~CFX_BitmapComposer() override; diff --git a/core/fxge/dib/cfx_bitmapstorer.h b/core/fxge/dib/cfx_bitmapstorer.h index 7d3482fc3f..3da1f70487 100644 --- a/core/fxge/dib/cfx_bitmapstorer.h +++ b/core/fxge/dib/cfx_bitmapstorer.h @@ -16,7 +16,7 @@ #include "core/fxge/dib/scanlinecomposer_iface.h" #include "third_party/base/stl_util.h" -class CFX_BitmapStorer : public ScanlineComposerIface { +class CFX_BitmapStorer final : public ScanlineComposerIface { public: CFX_BitmapStorer(); ~CFX_BitmapStorer() override; diff --git a/core/fxge/dib/cfx_imagetransformer.cpp b/core/fxge/dib/cfx_imagetransformer.cpp index 0042462c89..66446ce52c 100644 --- a/core/fxge/dib/cfx_imagetransformer.cpp +++ b/core/fxge/dib/cfx_imagetransformer.cpp @@ -180,7 +180,7 @@ class CPDF_FixedMatrix { const int f; }; -class CFX_BilinearMatrix : public CPDF_FixedMatrix { +class CFX_BilinearMatrix final : public CPDF_FixedMatrix { public: explicit CFX_BilinearMatrix(const CFX_Matrix& src) : CPDF_FixedMatrix(src) {} diff --git a/core/fxge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp index d2da781881..4d4f4e625e 100644 --- a/core/fxge/fx_ge_linux.cpp +++ b/core/fxge/fx_ge_linux.cpp @@ -66,7 +66,7 @@ size_t GetJapanesePreference(const char* facearr, return 2; } -class CFX_LinuxFontInfo : public CFX_FolderFontInfo { +class CFX_LinuxFontInfo final : public CFX_FolderFontInfo { public: CFX_LinuxFontInfo() {} ~CFX_LinuxFontInfo() override {} diff --git a/core/fxge/skia/fx_skia_device.h b/core/fxge/skia/fx_skia_device.h index ce6ca6b000..4baeacbce5 100644 --- a/core/fxge/skia/fx_skia_device.h +++ b/core/fxge/skia/fx_skia_device.h @@ -22,7 +22,7 @@ class SkPictureRecorder; class SkiaState; struct SkIRect; -class CFX_SkiaDeviceDriver : public RenderDeviceDriverIface { +class CFX_SkiaDeviceDriver final : public RenderDeviceDriverIface { public: CFX_SkiaDeviceDriver(const RetainPtr& pBitmap, bool bRgbByteOrder, diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h index c64fc7dc16..4b7de7d5f9 100644 --- a/core/fxge/win32/cfx_windowsdib.h +++ b/core/fxge/win32/cfx_windowsdib.h @@ -24,7 +24,7 @@ struct WINDIB_Open_Args_ { const wchar_t* path_name; }; -class CFX_WindowsDIB : public CFX_DIBitmap { +class CFX_WindowsDIB final : public CFX_DIBitmap { public: template friend RetainPtr pdfium::MakeRetain(Args&&... args); diff --git a/core/fxge/win32/cpsoutput.h b/core/fxge/win32/cpsoutput.h index 49317a64a5..04e5ac1fa0 100644 --- a/core/fxge/win32/cpsoutput.h +++ b/core/fxge/win32/cpsoutput.h @@ -12,7 +12,7 @@ #include "core/fxcrt/fx_stream.h" #include "core/fxcrt/fx_system.h" -class CPSOutput : public IFX_WriteStream { +class CPSOutput final : public IFX_WriteStream { public: enum class OutputMode { kExtEscape, kGdiComment }; diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h index 76a1d8800e..0bc68c46b9 100644 --- a/core/fxge/win32/win32_int.h +++ b/core/fxge/win32/win32_int.h @@ -188,7 +188,7 @@ class CGdiDeviceDriver : public RenderDeviceDriverIface { int m_RenderCaps; }; -class CGdiDisplayDriver : public CGdiDeviceDriver { +class CGdiDisplayDriver final : public CGdiDeviceDriver { public: explicit CGdiDisplayDriver(HDC hDC); ~CGdiDisplayDriver() override; @@ -229,7 +229,7 @@ class CGdiDisplayDriver : public CGdiDeviceDriver { int render_flags); }; -class CGdiPrinterDriver : public CGdiDeviceDriver { +class CGdiPrinterDriver final : public CGdiDeviceDriver { public: explicit CGdiPrinterDriver(HDC hDC); ~CGdiPrinterDriver() override; @@ -269,7 +269,7 @@ class CGdiPrinterDriver : public CGdiDeviceDriver { const int m_VertSize; }; -class CPSPrinterDriver : public RenderDeviceDriverIface { +class CPSPrinterDriver final : public RenderDeviceDriverIface { public: CPSPrinterDriver(HDC hDC, WindowsPrintMode mode, bool bCmykOutput); ~CPSPrinterDriver() override; @@ -334,7 +334,7 @@ class CPSPrinterDriver : public RenderDeviceDriverIface { CFX_PSRenderer m_PSRenderer; }; -class CTextOnlyPrinterDriver : public RenderDeviceDriverIface { +class CTextOnlyPrinterDriver final : public RenderDeviceDriverIface { public: explicit CTextOnlyPrinterDriver(HDC hDC); ~CTextOnlyPrinterDriver() override; -- cgit v1.2.3