From 17f382a50a7c4e5b6f14f76027a15de4ac17bc4c Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 12 Apr 2016 16:55:56 -0700 Subject: Cleanup various IFX_ text interfaces. This CL removes IFX_ArabicChar, IFX_RTFBreak, IFX_TxtBreak, IFX_WordBreak, IFX_FormatString, and IFX_GSUBTable. References were updated to be the concrete classes. The CFX_GSUBTable was also removed as it is unused. BUG=pdfium:468 Review URL: https://codereview.chromium.org/1882213002 --- core/fpdfapi/fpdf_font/ttgsubtable.cpp | 31 ------------------------------- core/fpdfapi/fpdf_font/ttgsubtable.h | 8 +------- 2 files changed, 1 insertion(+), 38 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/fpdfapi/fpdf_font/ttgsubtable.cpp index 321419346d..f6d6400f47 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -382,34 +382,3 @@ void CFX_CTTGSUBTable::ParseSingleSubstFormat2(FT_Bytes raw, rec->Substitute[i] = GetUInt16(sp); } } -FX_BOOL CFX_GSUBTable::GetVerticalGlyph(uint32_t glyphnum, - uint32_t* vglyphnum) { - return m_GsubImp.GetVerticalGlyph(glyphnum, vglyphnum); -} -// static -IFX_GSUBTable* IFX_GSUBTable::Create(CFX_Font* pFont) { - if (!pFont) { - return NULL; - } - if (!pFont->GetSubData()) { - unsigned long length = 0; - int error = FXFT_Load_Sfnt_Table( - pFont->GetFace(), FT_MAKE_TAG('G', 'S', 'U', 'B'), 0, NULL, &length); - if (!error) { - pFont->SetSubData(FX_Alloc(uint8_t, length)); - } - if (!pFont->GetSubData()) { - return NULL; - } - } - int error = - FXFT_Load_Sfnt_Table(pFont->GetFace(), FT_MAKE_TAG('G', 'S', 'U', 'B'), 0, - pFont->GetSubData(), NULL); - if (!error && pFont->GetSubData()) { - std::unique_ptr pGsubTable(new CFX_GSUBTable); - if (pGsubTable->m_GsubImp.LoadGSUBTable((FT_Bytes)pFont->GetSubData())) { - return pGsubTable.release(); - } - } - return NULL; -} diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h index 7a6c66cc2a..0ef2351336 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/fpdfapi/fpdf_font/ttgsubtable.h @@ -25,6 +25,7 @@ class CFX_GlyphMap { protected: CFX_BinaryBuf m_Buffer; }; + class CFX_CTTGSUBTable { public: CFX_CTTGSUBTable(void) : m_bFeautureMapLoad(FALSE), loaded(false) {} @@ -352,12 +353,5 @@ class CFX_CTTGSUBTable { struct TFeatureList FeatureList; struct TLookupList LookupList; }; -class CFX_GSUBTable final : public IFX_GSUBTable { - public: - ~CFX_GSUBTable() override {} - FX_BOOL GetVerticalGlyph(uint32_t glyphnum, uint32_t* vglyphnum) override; - - CFX_CTTGSUBTable m_GsubImp; -}; #endif // CORE_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_ -- cgit v1.2.3