Move CPDF_OCContext from fpdfapi/render to fpdfapi/page.
Similar to the previous CL, this class has dependencies only
at tha page layer or below, so it can move here to reduce some
illegal includes.
Change-Id: Ic0b4db96191ed6043c7cc5694e576848e0b33bf9
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/55717
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/page/BUILD.gn b/core/fpdfapi/page/BUILD.gn
index 6a79428..6244b8d 100644
--- a/core/fpdfapi/page/BUILD.gn
+++ b/core/fpdfapi/page/BUILD.gn
@@ -49,6 +49,8 @@
"cpdf_imageobject.h",
"cpdf_meshstream.cpp",
"cpdf_meshstream.h",
+ "cpdf_occontext.cpp",
+ "cpdf_occontext.h",
"cpdf_page.cpp",
"cpdf_page.h",
"cpdf_pagemodule.cpp",
diff --git a/core/fpdfapi/render/cpdf_occontext.cpp b/core/fpdfapi/page/cpdf_occontext.cpp
similarity index 99%
rename from core/fpdfapi/render/cpdf_occontext.cpp
rename to core/fpdfapi/page/cpdf_occontext.cpp
index 43a73a5..96f8a88 100644
--- a/core/fpdfapi/render/cpdf_occontext.cpp
+++ b/core/fpdfapi/page/cpdf_occontext.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "core/fpdfapi/render/cpdf_occontext.h"
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_pageobject.h"
#include "core/fpdfapi/parser/cpdf_array.h"
diff --git a/core/fpdfapi/render/cpdf_occontext.h b/core/fpdfapi/page/cpdf_occontext.h
similarity index 90%
rename from core/fpdfapi/render/cpdf_occontext.h
rename to core/fpdfapi/page/cpdf_occontext.h
index 03a1270..0a68639 100644
--- a/core/fpdfapi/render/cpdf_occontext.h
+++ b/core/fpdfapi/page/cpdf_occontext.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef CORE_FPDFAPI_RENDER_CPDF_OCCONTEXT_H_
-#define CORE_FPDFAPI_RENDER_CPDF_OCCONTEXT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_OCCONTEXT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_OCCONTEXT_H_
#include <map>
@@ -43,4 +43,4 @@
mutable std::map<const CPDF_Dictionary*, bool> m_OGCStateCache;
};
-#endif // CORE_FPDFAPI_RENDER_CPDF_OCCONTEXT_H_
+#endif // CORE_FPDFAPI_PAGE_CPDF_OCCONTEXT_H_
diff --git a/core/fpdfapi/page/cpdf_pagerendercontext.cpp b/core/fpdfapi/page/cpdf_pagerendercontext.cpp
index a3f75b1..0b768e6 100644
--- a/core/fpdfapi/page/cpdf_pagerendercontext.cpp
+++ b/core/fpdfapi/page/cpdf_pagerendercontext.cpp
@@ -6,7 +6,7 @@
#include "core/fpdfapi/page/cpdf_pagerendercontext.h"
-#include "core/fpdfapi/render/cpdf_occontext.h"
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/render/cpdf_progressiverenderer.h"
#include "core/fpdfapi/render/cpdf_rendercontext.h"
#include "core/fpdfapi/render/cpdf_renderoptions.h"
diff --git a/core/fpdfapi/render/BUILD.gn b/core/fpdfapi/render/BUILD.gn
index 0a404a4..2efbfad 100644
--- a/core/fpdfapi/render/BUILD.gn
+++ b/core/fpdfapi/render/BUILD.gn
@@ -24,8 +24,6 @@
"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 2355068..a0dcfdb 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -12,6 +12,7 @@
#include "core/fpdfapi/page/cpdf_docpagedata.h"
#include "core/fpdfapi/page/cpdf_image.h"
#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/page/cpdf_pageobject.h"
#include "core/fpdfapi/page/cpdf_shadingpattern.h"
@@ -21,7 +22,6 @@
#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"
diff --git a/core/fpdfapi/render/cpdf_renderoptions.h b/core/fpdfapi/render/cpdf_renderoptions.h
index 8843820..889c425 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/fpdfapi/render/cpdf_occontext.h"
+#include "core/fpdfapi/page/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 6ec26f1..1e98ebe 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -26,6 +26,7 @@
#include "core/fpdfapi/page/cpdf_image.h"
#include "core/fpdfapi/page/cpdf_imageobject.h"
#include "core/fpdfapi/page/cpdf_meshstream.h"
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/page/cpdf_pageobject.h"
#include "core/fpdfapi/page/cpdf_pathobject.h"
@@ -43,7 +44,6 @@
#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"
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index 8ca2bc0..2dc0f58 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -14,6 +14,7 @@
#include "constants/annotation_flags.h"
#include "constants/form_fields.h"
#include "constants/form_flags.h"
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
@@ -22,7 +23,6 @@
#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"
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.h b/fpdfsdk/cpdfsdk_formfillenvironment.h
index df13dd6..fbbe74e 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.h
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.h
@@ -11,9 +11,9 @@
#include <memory>
#include <vector>
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/parser/cpdf_document.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 af8363e..3a53dcd 100644
--- a/fpdfsdk/fpdf_formfill.cpp
+++ b/fpdfsdk/fpdf_formfill.cpp
@@ -9,10 +9,10 @@
#include <memory>
#include <vector>
+#include "core/fpdfapi/page/cpdf_occontext.h"
#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"
diff --git a/fpdfsdk/fpdf_view.cpp b/fpdfsdk/fpdf_view.cpp
index 97b4392..76a590e 100644
--- a/fpdfsdk/fpdf_view.cpp
+++ b/fpdfsdk/fpdf_view.cpp
@@ -13,6 +13,7 @@
#include "build/build_config.h"
#include "core/fpdfapi/cpdf_modulemgr.h"
#include "core/fpdfapi/page/cpdf_docpagedata.h"
+#include "core/fpdfapi/page/cpdf_occontext.h"
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/page/cpdf_pagerendercontext.h"
#include "core/fpdfapi/parser/cpdf_array.h"
@@ -22,7 +23,6 @@
#include "core/fpdfapi/parser/cpdf_parser.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfapi/render/cpdf_docrenderdata.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"
