Remove some unneeded cfx_renderdevice.h #includes from headers. Then do IWYU for affected files. Change-Id: Ica34fb7fff7cda5b9f4b7a023ab28adf3db27e09 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/56670 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fde/cfde_texteditengine.h b/xfa/fde/cfde_texteditengine.h index be89e36..7c78c6c 100644 --- a/xfa/fde/cfde_texteditengine.h +++ b/xfa/fde/cfde_texteditengine.h
@@ -13,7 +13,6 @@ #include "core/fxcrt/fx_string.h" #include "core/fxcrt/retain_ptr.h" -#include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_dib.h" #include "xfa/fgas/layout/cfx_txtbreak.h"
diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp index 2f1cc25..82ac53d 100644 --- a/xfa/fde/cfde_textout.cpp +++ b/xfa/fde/cfde_textout.cpp
@@ -14,6 +14,7 @@ #include "core/fxcrt/fx_system.h" #include "core/fxge/cfx_font.h" #include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "core/fxge/cfx_substfont.h" #include "core/fxge/fx_font.h" #include "core/fxge/text_char_pos.h"
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h index 1f39d1a..473f5bc 100644 --- a/xfa/fde/cfde_textout.h +++ b/xfa/fde/cfde_textout.h
@@ -11,7 +11,6 @@ #include <memory> #include <vector> -#include "core/fxge/cfx_renderdevice.h" #include "core/fxge/fx_dib.h" #include "third_party/base/span.h" #include "xfa/fde/cfde_data.h"
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp index 616240b..fa65bca 100644 --- a/xfa/fwl/cfwl_edit.cpp +++ b/xfa/fwl/cfwl_edit.cpp
@@ -12,6 +12,7 @@ #include <vector> #include "build/build_config.h" +#include "core/fxge/cfx_renderdevice.h" #include "core/fxge/text_char_pos.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h"
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp index 8d71d6b..297810b 100644 --- a/xfa/fwl/theme/cfwl_checkboxtp.cpp +++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp
@@ -7,6 +7,7 @@ #include "xfa/fwl/theme/cfwl_checkboxtp.h" #include "core/fxge/cfx_pathdata.h" +#include "core/fxge/render_defines.h" #include "third_party/base/ptr_util.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fwl/cfwl_checkbox.h"
diff --git a/xfa/fwl/theme/cfwl_comboboxtp.cpp b/xfa/fwl/theme/cfwl_comboboxtp.cpp index 6876965..486fa05 100644 --- a/xfa/fwl/theme/cfwl_comboboxtp.cpp +++ b/xfa/fwl/theme/cfwl_comboboxtp.cpp
@@ -6,6 +6,7 @@ #include "xfa/fwl/theme/cfwl_comboboxtp.h" +#include "core/fxge/render_defines.h" #include "xfa/fwl/cfwl_combobox.h" #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h"
diff --git a/xfa/fwl/theme/cfwl_edittp.cpp b/xfa/fwl/theme/cfwl_edittp.cpp index ff8501e..434e9ff 100644 --- a/xfa/fwl/theme/cfwl_edittp.cpp +++ b/xfa/fwl/theme/cfwl_edittp.cpp
@@ -6,6 +6,7 @@ #include "xfa/fwl/theme/cfwl_edittp.h" +#include "core/fxge/render_defines.h" #include "xfa/fwl/cfwl_edit.h" #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h"
diff --git a/xfa/fwl/theme/cfwl_listboxtp.cpp b/xfa/fwl/theme/cfwl_listboxtp.cpp index a59b774..2188aeb 100644 --- a/xfa/fwl/theme/cfwl_listboxtp.cpp +++ b/xfa/fwl/theme/cfwl_listboxtp.cpp
@@ -7,6 +7,7 @@ #include "xfa/fwl/theme/cfwl_listboxtp.h" #include "build/build_config.h" +#include "core/fxge/render_defines.h" #include "xfa/fwl/cfwl_listbox.h" #include "xfa/fwl/cfwl_themebackground.h" #include "xfa/fwl/cfwl_widget.h"
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp index 8975fef..750c3d7 100644 --- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp +++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
@@ -6,6 +6,7 @@ #include "xfa/fwl/theme/cfwl_monthcalendartp.h" +#include "core/fxge/render_defines.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fwl/cfwl_monthcalendar.h" #include "xfa/fwl/cfwl_themebackground.h"
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp index 06250ba..f00e8b6 100644 --- a/xfa/fwl/theme/cfwl_widgettp.cpp +++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -9,6 +9,7 @@ #include <algorithm> #include <utility> +#include "core/fxge/render_defines.h" #include "third_party/base/ptr_util.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fgas/font/cfgas_fontmgr.h"
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 2a6bad0..6176b3b 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -8,6 +8,7 @@ #include <algorithm> +#include "core/fxge/render_defines.h" #include "xfa/fwl/cfwl_edit.h" #include "xfa/fwl/cfwl_eventmouse.h" #include "xfa/fwl/cfwl_messagekey.h"
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp index fd3f305..b57c77a 100644 --- a/xfa/fxfa/cxfa_textlayout.cpp +++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -16,6 +16,7 @@ #include "core/fxcrt/xml/cfx_xmltext.h" #include "core/fxge/cfx_graphstatedata.h" #include "core/fxge/cfx_pathdata.h" +#include "core/fxge/cfx_renderdevice.h" #include "core/fxge/text_char_pos.h" #include "fxjs/xfa/cjx_object.h" #include "third_party/base/ptr_util.h"