commit 4f26084fa0768f94958bde9fa9eaa9bbee2c94a5
author Lei Zhang <thestig@chromium.org> Sat Dec 16 02:14:53 2023 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Sat Dec 16 02:14:53 2023 +0000
tree 11a6d90c0121101f5462d53fbe6d76fc1cfd5b06
parent b2d4f1104c43ccd42df2e48902ae857f0d5a188a

Remove spurious fx_freetype.h includes

Files that do not contain "FT" are unlikely to be using FreeType.

Change-Id: I069700bc4525c04e7a92d96c6bddcc62f08f4816
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/114773
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fpdfapi/font/cfx_cttgsubtable.h

diff --git a/core/fpdfapi/font/cfx_cttgsubtable.h b/core/fpdfapi/font/cfx_cttgsubtable.h
index 2a93cb9..e6b797a 100644
--- a/core/fpdfapi/font/cfx_cttgsubtable.h
+++ b/core/fpdfapi/font/cfx_cttgsubtable.h
@@ -13,7 +13,6 @@
 #include <vector>
 
 #include "core/fxcrt/data_vector.h"
-#include "core/fxge/freetype/fx_freetype.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
 #include "third_party/base/containers/span.h"

core/fpdfapi/font/cpdf_cmapparser.cpp

diff --git a/core/fpdfapi/font/cpdf_cmapparser.cpp b/core/fpdfapi/font/cpdf_cmapparser.cpp
index 465b6fc..e026cb1 100644
--- a/core/fpdfapi/font/cpdf_cmapparser.cpp
+++ b/core/fpdfapi/font/cpdf_cmapparser.cpp
@@ -16,7 +16,6 @@
 #include "core/fpdfapi/parser/cpdf_simple_parser.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_safe_types.h"
-#include "core/fxge/freetype/fx_freetype.h"
 #include "third_party/base/check.h"
 
 namespace {

core/fxge/apple/fx_apple_impl.cpp

diff --git a/core/fxge/apple/fx_apple_impl.cpp b/core/fxge/apple/fx_apple_impl.cpp
index fa397c0..935c33f 100644
--- a/core/fxge/apple/fx_apple_impl.cpp
+++ b/core/fxge/apple/fx_apple_impl.cpp
@@ -21,7 +21,6 @@
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/cfx_substfont.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/freetype/fx_freetype.h"
 #include "core/fxge/text_char_pos.h"
 #include "third_party/base/containers/span.h"
 

core/fxge/apple/fx_quartz_device.cpp

diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index 24e0c9c..f70271c 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -13,7 +13,6 @@
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
-#include "core/fxge/freetype/fx_freetype.h"
 
 #ifndef CGFLOAT_IS_DOUBLE
 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers

core/fxge/cfx_fontcache.cpp

diff --git a/core/fxge/cfx_fontcache.cpp b/core/fxge/cfx_fontcache.cpp
index 8079910..0e267a9 100644
--- a/core/fxge/cfx_fontcache.cpp
+++ b/core/fxge/cfx_fontcache.cpp
@@ -8,7 +8,6 @@
 
 #include "core/fxge/cfx_font.h"
 #include "core/fxge/cfx_glyphcache.h"
-#include "core/fxge/freetype/fx_freetype.h"
 #include "core/fxge/fx_font.h"
 
 CFX_FontCache::CFX_FontCache() = default;

core/fxge/cfx_fontcache.h

diff --git a/core/fxge/cfx_fontcache.h b/core/fxge/cfx_fontcache.h
index fc0351e..57f5d1e 100644
--- a/core/fxge/cfx_fontcache.h
+++ b/core/fxge/cfx_fontcache.h
@@ -12,7 +12,6 @@
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxge/cfx_glyphcache.h"
-#include "core/fxge/freetype/fx_freetype.h"
 
 class CFX_Font;
 

xfa/fgas/font/cfgas_fontmgr.h

diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 02cb47a..8bfb8a9 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -18,7 +18,6 @@
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/widestring.h"
 #include "core/fxge/cfx_face.h"
-#include "core/fxge/freetype/fx_freetype.h"
 
 class CFGAS_GEFont;
 class IFX_SeekableReadStream;