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/fpdfapi/font/cfx_cttgsubtable.h | 8 ++++---- core/fpdfapi/font/cpdf_cidfont.h | 2 +- core/fpdfapi/font/cpdf_cmap.h | 2 +- core/fpdfapi/font/cpdf_truetypefont.h | 2 +- core/fpdfapi/font/cpdf_type1font.h | 2 +- core/fpdfapi/font/cpdf_type3font.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core/fpdfapi/font') diff --git a/core/fpdfapi/font/cfx_cttgsubtable.h b/core/fpdfapi/font/cfx_cttgsubtable.h index ff488a5ed7..6b23a8db27 100644 --- a/core/fpdfapi/font/cfx_cttgsubtable.h +++ b/core/fpdfapi/font/cfx_cttgsubtable.h @@ -64,14 +64,14 @@ class CFX_CTTGSUBTable { uint16_t CoverageFormat; }; - struct TCoverageFormat1 : public TCoverageFormatBase { + struct TCoverageFormat1 final : public TCoverageFormatBase { TCoverageFormat1(); ~TCoverageFormat1() override; std::vector GlyphArray; }; - struct TCoverageFormat2 : public TCoverageFormatBase { + struct TCoverageFormat2 final : public TCoverageFormatBase { TCoverageFormat2(); ~TCoverageFormat2() override; @@ -94,14 +94,14 @@ class CFX_CTTGSUBTable { uint16_t SubstFormat; }; - struct TSubTable1 : public TSubTableBase { + struct TSubTable1 final : public TSubTableBase { TSubTable1(); ~TSubTable1() override; int16_t DeltaGlyphID; }; - struct TSubTable2 : public TSubTableBase { + struct TSubTable2 final : public TSubTableBase { TSubTable2(); ~TSubTable2() override; diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h index 9dde95d75e..7aeb54b877 100644 --- a/core/fpdfapi/font/cpdf_cidfont.h +++ b/core/fpdfapi/font/cpdf_cidfont.h @@ -32,7 +32,7 @@ class CPDF_CID2UnicodeMap; class CPDF_CMap; class CPDF_StreamAcc; -class CPDF_CIDFont : public CPDF_Font { +class CPDF_CIDFont final : public CPDF_Font { public: CPDF_CIDFont(CPDF_Document* pDocument, CPDF_Dictionary* pFontDict); ~CPDF_CIDFont() override; diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h index 45053bdfb5..228c207876 100644 --- a/core/fpdfapi/font/cpdf_cmap.h +++ b/core/fpdfapi/font/cpdf_cmap.h @@ -27,7 +27,7 @@ enum CIDCoding : uint8_t { CIDCODING_UTF16, }; -class CPDF_CMap : public Retainable { +class CPDF_CMap final : public Retainable { public: enum CodingScheme : uint8_t { OneByte, diff --git a/core/fpdfapi/font/cpdf_truetypefont.h b/core/fpdfapi/font/cpdf_truetypefont.h index d63e8f105a..a3066d74fa 100644 --- a/core/fpdfapi/font/cpdf_truetypefont.h +++ b/core/fpdfapi/font/cpdf_truetypefont.h @@ -10,7 +10,7 @@ #include "core/fpdfapi/font/cpdf_simplefont.h" #include "core/fxcrt/fx_system.h" -class CPDF_TrueTypeFont : public CPDF_SimpleFont { +class CPDF_TrueTypeFont final : public CPDF_SimpleFont { public: CPDF_TrueTypeFont(CPDF_Document* pDocument, CPDF_Dictionary* pFontDict); ~CPDF_TrueTypeFont() override; diff --git a/core/fpdfapi/font/cpdf_type1font.h b/core/fpdfapi/font/cpdf_type1font.h index cbcb9af3b1..0fdfa807d3 100644 --- a/core/fpdfapi/font/cpdf_type1font.h +++ b/core/fpdfapi/font/cpdf_type1font.h @@ -10,7 +10,7 @@ #include "core/fpdfapi/font/cpdf_simplefont.h" #include "core/fxcrt/fx_system.h" -class CPDF_Type1Font : public CPDF_SimpleFont { +class CPDF_Type1Font final : public CPDF_SimpleFont { public: CPDF_Type1Font(CPDF_Document* pDocument, CPDF_Dictionary* pFontDict); ~CPDF_Type1Font() override; diff --git a/core/fpdfapi/font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h index 0be1fa3f69..d85bf701df 100644 --- a/core/fpdfapi/font/cpdf_type3font.h +++ b/core/fpdfapi/font/cpdf_type3font.h @@ -17,7 +17,7 @@ class CPDF_Dictionary; class CPDF_Type3Char; -class CPDF_Type3Font : public CPDF_SimpleFont { +class CPDF_Type3Font final : public CPDF_SimpleFont { public: CPDF_Type3Font(CPDF_Document* pDocument, CPDF_Dictionary* pFontDict); ~CPDF_Type3Font() override; -- cgit v1.2.3