From 37fa2835becf6c5ed4c9b7c8042493c2a00f642e Mon Sep 17 00:00:00 2001 From: thestig Date: Thu, 29 Sep 2016 07:41:46 -0700 Subject: Remove unused CFX_AutoFontCache All usage were refactored in commit 9972ff99. Review-Url: https://codereview.chromium.org/2377203002 --- BUILD.gn | 2 -- core/fpdfapi/fpdf_render/fpdf_render_text.cpp | 1 - core/fxge/ge/cfx_autofontcache.cpp | 17 ----------------- core/fxge/ge/cfx_renderdevice.cpp | 1 - core/fxge/include/cfx_autofontcache.h | 23 ----------------------- 5 files changed, 44 deletions(-) delete mode 100644 core/fxge/ge/cfx_autofontcache.cpp delete mode 100644 core/fxge/include/cfx_autofontcache.h diff --git a/BUILD.gn b/BUILD.gn index 778e03829c..22135300ac 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -782,7 +782,6 @@ static_library("fxge") { "core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp", "core/fxge/fontdata/chromefontdata/chromefontdata.h", "core/fxge/freetype/fx_freetype.cpp", - "core/fxge/ge/cfx_autofontcache.cpp", "core/fxge/ge/cfx_cliprgn.cpp", "core/fxge/ge/cfx_cliprgn.h", "core/fxge/ge/cfx_facecache.cpp", @@ -806,7 +805,6 @@ static_library("fxge") { "core/fxge/ge/fx_ge_text.cpp", "core/fxge/ge/fx_text_int.h", "core/fxge/ifx_renderdevicedriver.cpp", - "core/fxge/include/cfx_autofontcache.h", "core/fxge/include/cfx_facecache.h", "core/fxge/include/cfx_fontcache.h", "core/fxge/include/cfx_fontmapper.h", diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp index 991b57ab7f..4c1daa40f0 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -23,7 +23,6 @@ #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h" #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h" -#include "core/fxge/include/cfx_autofontcache.h" #include "core/fxge/include/cfx_facecache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_gemodule.h" diff --git a/core/fxge/ge/cfx_autofontcache.cpp b/core/fxge/ge/cfx_autofontcache.cpp deleted file mode 100644 index 871f207c17..0000000000 --- a/core/fxge/ge/cfx_autofontcache.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#include "core/fxge/include/cfx_autofontcache.h" - -#include "core/fxge/include/cfx_fontcache.h" -#include "core/fxge/include/fx_font.h" - -CFX_AutoFontCache::CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont) - : m_pFontCache(pFontCache), m_pFont(pFont) {} - -CFX_AutoFontCache::~CFX_AutoFontCache() { - m_pFontCache->ReleaseCachedFace(m_pFont); -} diff --git a/core/fxge/ge/cfx_renderdevice.cpp b/core/fxge/ge/cfx_renderdevice.cpp index 11f0087f92..eadd912be4 100644 --- a/core/fxge/ge/cfx_renderdevice.cpp +++ b/core/fxge/ge/cfx_renderdevice.cpp @@ -7,7 +7,6 @@ #include "core/fxge/include/cfx_renderdevice.h" #include "core/fxcrt/include/fx_safe_types.h" -#include "core/fxge/include/cfx_autofontcache.h" #include "core/fxge/include/cfx_facecache.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" diff --git a/core/fxge/include/cfx_autofontcache.h b/core/fxge/include/cfx_autofontcache.h deleted file mode 100644 index c1ef079d4f..0000000000 --- a/core/fxge/include/cfx_autofontcache.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef CORE_FXGE_INCLUDE_CFX_AUTOFONTCACHE_H_ -#define CORE_FXGE_INCLUDE_CFX_AUTOFONTCACHE_H_ - -#include "core/fxge/include/cfx_fontcache.h" -#include "core/fxge/include/fx_font.h" - -class CFX_AutoFontCache { - public: - CFX_AutoFontCache(CFX_FontCache* pFontCache, CFX_Font* pFont); - ~CFX_AutoFontCache(); - - private: - CFX_FontCache* m_pFontCache; - CFX_Font* m_pFont; -}; - -#endif // CORE_FXGE_INCLUDE_CFX_AUTOFONTCACHE_H_ -- cgit v1.2.3