From 96d6b4df3a96976bb3d9ba068a88bf655f3da856 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 11 Jan 2018 14:31:41 +0000 Subject: Remove core/fxge/cfx_fontmgr.h from headers. Then do IWYU for CFX_FontMgr users. Change-Id: Id77529ccf45ec448c56c40412b78eb55925bd00e Reviewed-on: https://pdfium-review.googlesource.com/22531 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fxge/android/fx_android_imp.cpp | 1 + core/fxge/apple/fx_mac_imp.cpp | 1 + core/fxge/cfx_fontmapper.cpp | 2 +- core/fxge/cfx_fontmapper.h | 3 ++- core/fxge/cfx_fontmgr.h | 2 +- core/fxge/cfx_gemodule.h | 1 - core/fxge/cfx_renderdevice.cpp | 1 + core/fxge/fx_ge_linux.cpp | 1 + core/fxge/win32/fx_win32_device.cpp | 1 + fpdfsdk/fpdf_sysfontinfo.cpp | 1 + testing/unit_test_main.cpp | 1 + 11 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/fxge/android/fx_android_imp.cpp b/core/fxge/android/fx_android_imp.cpp index e4fdd1e131..db2f3efbec 100644 --- a/core/fxge/android/fx_android_imp.cpp +++ b/core/fxge/android/fx_android_imp.cpp @@ -11,6 +11,7 @@ #include "core/fxge/android/cfpf_skiadevicemodule.h" #include "core/fxge/android/cfx_androidfontinfo.h" +#include "core/fxge/cfx_fontmgr.h" #include "third_party/base/ptr_util.h" void CFX_GEModule::InitPlatform() { diff --git a/core/fxge/apple/fx_mac_imp.cpp b/core/fxge/apple/fx_mac_imp.cpp index 3f75984f47..b212f1567c 100644 --- a/core/fxge/apple/fx_mac_imp.cpp +++ b/core/fxge/apple/fx_mac_imp.cpp @@ -10,6 +10,7 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxge/apple/apple_int.h" #include "core/fxge/cfx_folderfontinfo.h" +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/ifx_systemfontinfo.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp index 0aa41239eb..7dba8f68b1 100644 --- a/core/fxge/cfx_fontmapper.cpp +++ b/core/fxge/cfx_fontmapper.cpp @@ -14,10 +14,10 @@ #include #include "core/fxcrt/fx_codepage.h" +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_substfont.h" #include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" - #include "third_party/base/stl_util.h" namespace { diff --git a/core/fxge/cfx_fontmapper.h b/core/fxge/cfx_fontmapper.h index b01137fe79..ed8ab61445 100644 --- a/core/fxge/cfx_fontmapper.h +++ b/core/fxge/cfx_fontmapper.h @@ -11,10 +11,11 @@ #include #include -#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/fx_font.h" +class CFX_FontMgr; class CFX_SubstFont; +class IFX_SystemFontInfo; class CFX_FontMapper { public: diff --git a/core/fxge/cfx_fontmgr.h b/core/fxge/cfx_fontmgr.h index 5c888a743e..e53a4ca324 100644 --- a/core/fxge/cfx_fontmgr.h +++ b/core/fxge/cfx_fontmgr.h @@ -12,10 +12,10 @@ #include "core/fxge/fx_font.h" -class IFX_SystemFontInfo; class CFX_FontMapper; class CFX_SubstFont; class CTTFontDesc; +class IFX_SystemFontInfo; class CFX_FontMgr { public: diff --git a/core/fxge/cfx_gemodule.h b/core/fxge/cfx_gemodule.h index 2816ca9b22..7849937f8f 100644 --- a/core/fxge/cfx_gemodule.h +++ b/core/fxge/cfx_gemodule.h @@ -9,7 +9,6 @@ #include -#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/fx_font.h" class CFX_FontCache; diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp index 9ed77e8b7f..63bf1d9ebd 100644 --- a/core/fxge/cfx_renderdevice.cpp +++ b/core/fxge/cfx_renderdevice.cpp @@ -15,6 +15,7 @@ #include "core/fxge/cfx_defaultrenderdevice.h" #include "core/fxge/cfx_facecache.h" #include "core/fxge/cfx_font.h" +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" diff --git a/core/fxge/fx_ge_linux.cpp b/core/fxge/fx_ge_linux.cpp index 65c9e56ff6..d5069f332a 100644 --- a/core/fxge/fx_ge_linux.cpp +++ b/core/fxge/fx_ge_linux.cpp @@ -9,6 +9,7 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxge/cfx_folderfontinfo.h" +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/ifx_systemfontinfo.h" #include "third_party/base/ptr_util.h" diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 77e988cc42..492b0b57df 100644 --- a/core/fxge/win32/fx_win32_device.cpp +++ b/core/fxge/win32/fx_win32_device.cpp @@ -15,6 +15,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxcrt/maybe_owned.h" #include "core/fxge/cfx_folderfontinfo.h" +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_windowsrenderdevice.h" #include "core/fxge/dib/cfx_dibextractor.h" diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 9d5270c1f0..97d02e85f5 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -10,6 +10,7 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxge/cfx_fontmapper.h" +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/fx_font.h" #include "core/fxge/ifx_systemfontinfo.h" diff --git a/testing/unit_test_main.cpp b/testing/unit_test_main.cpp index ffc95216cc..64b12993a9 100644 --- a/testing/unit_test_main.cpp +++ b/testing/unit_test_main.cpp @@ -9,6 +9,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if PDF_ENABLE_XFA +#include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_gefont.h" -- cgit v1.2.3