Remove circular includes between cpdfdoc and core/fpdfapi/render Moving cpdf_occconext.* to core/fpdfapi/render accomplishes this cleanly. Change-Id: Ife49f4a8223877375129011c04a53bf62e360815 Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/54992 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp index 39a881c..77d0ea5 100644 --- a/core/fpdfapi/cpdf_pagerendercontext.cpp +++ b/core/fpdfapi/cpdf_pagerendercontext.cpp
@@ -6,11 +6,11 @@ #include "core/fpdfapi/cpdf_pagerendercontext.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/render/cpdf_progressiverenderer.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_annotlist.h" -#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/cfx_renderdevice.h" CPDF_PageRenderContext::CPDF_PageRenderContext() {}
diff --git a/core/fpdfapi/render/BUILD.gn b/core/fpdfapi/render/BUILD.gn index b840c9e..4129b2f 100644 --- a/core/fpdfapi/render/BUILD.gn +++ b/core/fpdfapi/render/BUILD.gn
@@ -24,6 +24,8 @@ "cpdf_imageloader.h", "cpdf_imagerenderer.cpp", "cpdf_imagerenderer.h", + "cpdf_occontext.cpp", + "cpdf_occontext.h", "cpdf_pagerendercache.cpp", "cpdf_pagerendercache.h", "cpdf_progressiverenderer.cpp",
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp index 183823e..784c976 100644 --- a/core/fpdfapi/render/cpdf_imagerenderer.cpp +++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -21,11 +21,11 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/render/cpdf_dibbase.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" -#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/maybe_owned.h" #include "core/fxge/cfx_defaultrenderdevice.h"
diff --git a/core/fpdfdoc/cpdf_occontext.cpp b/core/fpdfapi/render/cpdf_occontext.cpp similarity index 99% rename from core/fpdfdoc/cpdf_occontext.cpp rename to core/fpdfapi/render/cpdf_occontext.cpp index 8613bdd..43a73a5 100644 --- a/core/fpdfdoc/cpdf_occontext.cpp +++ b/core/fpdfapi/render/cpdf_occontext.cpp
@@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfdoc/cpdf_occontext.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/page/cpdf_pageobject.h" #include "core/fpdfapi/parser/cpdf_array.h"
diff --git a/core/fpdfdoc/cpdf_occontext.h b/core/fpdfapi/render/cpdf_occontext.h similarity index 90% rename from core/fpdfdoc/cpdf_occontext.h rename to core/fpdfapi/render/cpdf_occontext.h index 5aaed38..03a1270 100644 --- a/core/fpdfdoc/cpdf_occontext.h +++ b/core/fpdfapi/render/cpdf_occontext.h
@@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_FPDFDOC_CPDF_OCCONTEXT_H_ -#define CORE_FPDFDOC_CPDF_OCCONTEXT_H_ +#ifndef CORE_FPDFAPI_RENDER_CPDF_OCCONTEXT_H_ +#define CORE_FPDFAPI_RENDER_CPDF_OCCONTEXT_H_ #include <map> @@ -43,4 +43,4 @@ mutable std::map<const CPDF_Dictionary*, bool> m_OGCStateCache; }; -#endif // CORE_FPDFDOC_CPDF_OCCONTEXT_H_ +#endif // CORE_FPDFAPI_RENDER_CPDF_OCCONTEXT_H_
diff --git a/core/fpdfapi/render/cpdf_renderoptions.h b/core/fpdfapi/render/cpdf_renderoptions.h index a8b86d6..8843820 100644 --- a/core/fpdfapi/render/cpdf_renderoptions.h +++ b/core/fpdfapi/render/cpdf_renderoptions.h
@@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_RENDER_CPDF_RENDEROPTIONS_H_ #define CORE_FPDFAPI_RENDER_CPDF_RENDEROPTIONS_H_ -#include "core/fpdfdoc/cpdf_occontext.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fxcrt/fx_system.h" #include "core/fxcrt/retain_ptr.h" #include "core/fxge/fx_dib.h"
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 226351d..1c28227 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -42,6 +42,7 @@ #include "core/fpdfapi/render/cpdf_dibbase.h" #include "core/fpdfapi/render/cpdf_docrenderdata.h" #include "core/fpdfapi/render/cpdf_imagerenderer.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" @@ -49,7 +50,6 @@ #include "core/fpdfapi/render/cpdf_textrenderer.h" #include "core/fpdfapi/render/cpdf_transferfunc.h" #include "core/fpdfapi/render/cpdf_type3cache.h" -#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxcrt/autorestorer.h" #include "core/fxcrt/fx_safe_types.h" #include "core/fxcrt/fx_system.h"
diff --git a/core/fpdfdoc/BUILD.gn b/core/fpdfdoc/BUILD.gn index 82289f3..32188e7 100644 --- a/core/fpdfdoc/BUILD.gn +++ b/core/fpdfdoc/BUILD.gn
@@ -54,8 +54,6 @@ "cpdf_nametree.h", "cpdf_numbertree.cpp", "cpdf_numbertree.h", - "cpdf_occontext.cpp", - "cpdf_occontext.h", "cpdf_pagelabel.cpp", "cpdf_pagelabel.h", "cpdf_structelement.cpp", @@ -95,7 +93,6 @@ "../fxcrt", "../fxge", ] - allow_circular_includes_from = [ "../fpdfapi/render" ] visibility = [ "../../*" ] }
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp index 836d5d4..8ca2bc0 100644 --- a/core/fpdfdoc/cpdf_annotlist.cpp +++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -22,11 +22,11 @@ #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_string.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_annot.h" #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interactiveform.h" -#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpvt_generateap.h" #include "core/fxge/cfx_renderdevice.h" #include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h index a61a157..df13dd6 100644 --- a/fpdfsdk/cpdfsdk_formfillenvironment.h +++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -13,7 +13,7 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_document.h" -#include "core/fpdfdoc/cpdf_occontext.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fxcrt/observable.h" #include "fpdfsdk/cpdfsdk_annot.h" #include "fpdfsdk/cpdfsdk_helpers.h"
diff --git a/fpdfsdk/fpdf_formfill.cpp b/fpdfsdk/fpdf_formfill.cpp index cf5e735..af8363e 100644 --- a/fpdfsdk/fpdf_formfill.cpp +++ b/fpdfsdk/fpdf_formfill.cpp
@@ -12,11 +12,11 @@ #include "core/fpdfapi/page/cpdf_page.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_document.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_formcontrol.h" #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fpdfdoc/cpdf_interactiveform.h" -#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fxge/cfx_defaultrenderdevice.h" #include "fpdfsdk/cpdfsdk_actionhandler.h" #include "fpdfsdk/cpdfsdk_formfillenvironment.h"
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp index f9bc6c0..1aa6943 100644 --- a/fpdfsdk/fpdf_view.cpp +++ b/fpdfsdk/fpdf_view.cpp
@@ -20,12 +20,12 @@ #include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" +#include "core/fpdfapi/render/cpdf_occontext.h" #include "core/fpdfapi/render/cpdf_progressiverenderer.h" #include "core/fpdfapi/render/cpdf_rendercontext.h" #include "core/fpdfapi/render/cpdf_renderoptions.h" #include "core/fpdfdoc/cpdf_annotlist.h" #include "core/fpdfdoc/cpdf_nametree.h" -#include "core/fpdfdoc/cpdf_occontext.h" #include "core/fpdfdoc/cpdf_viewerpreferences.h" #include "core/fxcrt/cfx_readonlymemorystream.h" #include "core/fxcrt/fx_stream.h"