Move cba_fontmap.{h,cpp} from fpdfsdk/ down to core/fpdfdoc.
Now that the fpdfsdk/ dependencies have been removed from cba_fontmap,
it can drop down a layer and become part of fpdfdoc. Long term, this
may help with pwl -> fpdfsdk dependencies. There is also one unused
public header that we can no longer include, but it was unused.
Change-Id: I0d7230a291b3c2cf37e392875de669ec5503028a
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/55534
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfdoc/BUILD.gn b/core/fpdfdoc/BUILD.gn
index 32188e7..ace41a6 100644
--- a/core/fpdfdoc/BUILD.gn
+++ b/core/fpdfdoc/BUILD.gn
@@ -8,6 +8,8 @@
jumbo_source_set("fpdfdoc") {
sources = [
+ "cba_fontmap.cpp",
+ "cba_fontmap.h",
"cline.cpp",
"cline.h",
"cpdf_aaction.cpp",
@@ -86,6 +88,7 @@
configs += [ "../../:pdfium_core_config" ]
deps = [
"../../constants",
+ "../fpdfapi",
"../fpdfapi/font",
"../fpdfapi/page",
"../fpdfapi/parser",
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/core/fpdfdoc/cba_fontmap.cpp
similarity index 99%
rename from fpdfsdk/formfiller/cba_fontmap.cpp
rename to core/fpdfdoc/cba_fontmap.cpp
index d4f9334..fbeee07 100644
--- a/fpdfsdk/formfiller/cba_fontmap.cpp
+++ b/core/fpdfdoc/cba_fontmap.cpp
@@ -4,7 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#include "fpdfsdk/formfiller/cba_fontmap.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include <memory>
#include <utility>
diff --git a/fpdfsdk/formfiller/cba_fontmap.h b/core/fpdfdoc/cba_fontmap.h
similarity index 94%
rename from fpdfsdk/formfiller/cba_fontmap.h
rename to core/fpdfdoc/cba_fontmap.h
index 2639cac..9d27380 100644
--- a/fpdfsdk/formfiller/cba_fontmap.h
+++ b/core/fpdfdoc/cba_fontmap.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
-#define FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
+#ifndef CORE_FPDFDOC_CBA_FONTMAP_H_
+#define CORE_FPDFDOC_CBA_FONTMAP_H_
#include <memory>
#include <vector>
@@ -13,7 +13,6 @@
#include "core/fpdfdoc/ipvt_fontmap.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/unowned_ptr.h"
-#include "public/fpdf_sysfontinfo.h"
class CPDF_Dictionary;
class CPDF_Document;
@@ -93,4 +92,4 @@
ByteString m_sAPType = "N";
};
-#endif // FPDFSDK_FORMFILLER_CBA_FONTMAP_H_
+#endif // CORE_FPDFDOC_CBA_FONTMAP_H_
diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn
index 255e68c..a3241e1 100644
--- a/fpdfsdk/BUILD.gn
+++ b/fpdfsdk/BUILD.gn
@@ -88,7 +88,6 @@
"../core/fxge",
"../fxjs",
"formfiller",
- "formfiller:fontmap",
"pwl",
]
allow_circular_includes_from = [
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index c4358a2..abd50c1 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -16,6 +16,7 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_string.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include "core/fpdfdoc/cpdf_defaultappearance.h"
#include "core/fpdfdoc/cpdf_formcontrol.h"
#include "core/fpdfdoc/cpdf_formfield.h"
@@ -29,7 +30,6 @@
#include "fpdfsdk/cpdfsdk_helpers.h"
#include "fpdfsdk/cpdfsdk_interactiveform.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/pwl/cpwl_appstream.h"
#include "fpdfsdk/pwl/cpwl_edit.h"
diff --git a/fpdfsdk/formfiller/BUILD.gn b/fpdfsdk/formfiller/BUILD.gn
index 45a2359..16fdc60 100644
--- a/fpdfsdk/formfiller/BUILD.gn
+++ b/fpdfsdk/formfiller/BUILD.gn
@@ -30,34 +30,14 @@
]
configs += [ "../../:pdfium_core_config" ]
deps = [
- ":fontmap",
"../../:pdfium_public_headers",
"../../constants",
"../../core/fpdfapi/page",
"../../core/fpdfapi/parser",
- "../../core/fxcrt",
- "../../core/fxge",
- "../pwl",
- ]
- visibility = [ "../../*" ]
-}
-
-jumbo_source_set("fontmap") {
- sources = [
- "cba_fontmap.cpp",
- "cba_fontmap.h",
- ]
- configs += [ "../../:pdfium_core_config" ]
- deps = [
- "../../:pdfium_public_headers",
- "../../constants",
- "../../core/fpdfapi",
- "../../core/fpdfapi/font",
- "../../core/fpdfapi/page",
- "../../core/fpdfapi/parser",
"../../core/fpdfdoc",
"../../core/fxcrt",
"../../core/fxge",
+ "../pwl",
]
visibility = [ "../../*" ]
}
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index a27ec51..5d681df 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -9,9 +9,9 @@
#include <utility>
#include "constants/form_flags.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fpdfsdk/pwl/cpwl_combo_box.h"
#include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index e492b29..2ab6afd 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -10,11 +10,11 @@
#include "constants/form_flags.h"
#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include "core/fxge/cfx_renderdevice.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
CFFL_FormFiller::CFFL_FormFiller(CPDFSDK_FormFillEnvironment* pFormFillEnv,
CPDFSDK_Widget* pWidget)
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index 6fc6124..0f098e2 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -10,9 +10,9 @@
#include <map>
#include <memory>
+#include "core/fpdfdoc/cba_fontmap.h"
#include "core/fxcrt/unowned_ptr.h"
#include "fpdfsdk/cpdfsdk_fieldaction.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
class CPDFSDK_Annot;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 0955725..f2e5dc5 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -9,9 +9,9 @@
#include <utility>
#include "constants/form_flags.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fpdfsdk/pwl/cpwl_list_box.h"
#include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index 3d299de..b0ceef7 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -9,9 +9,9 @@
#include <utility>
#include "constants/form_flags.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "public/fpdf_fwlevent.h"
#include "third_party/base/ptr_util.h"
diff --git a/fpdfsdk/pwl/BUILD.gn b/fpdfsdk/pwl/BUILD.gn
index ccf7e1f..aa905fc 100644
--- a/fpdfsdk/pwl/BUILD.gn
+++ b/fpdfsdk/pwl/BUILD.gn
@@ -50,7 +50,6 @@
"../../core/fpdfdoc",
"../../core/fxcrt",
"../../core/fxge",
- "../formfiller:fontmap",
]
visibility = [ "../../*" ]
}
diff --git a/fpdfsdk/pwl/cpwl_appstream.cpp b/fpdfsdk/pwl/cpwl_appstream.cpp
index 2e9ca5c..c7f4ff7 100644
--- a/fpdfsdk/pwl/cpwl_appstream.cpp
+++ b/fpdfsdk/pwl/cpwl_appstream.cpp
@@ -17,12 +17,12 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
+#include "core/fpdfdoc/cba_fontmap.h"
#include "core/fpdfdoc/cpvt_word.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_interactiveform.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/pwl/cpwl_edit.h"
#include "fpdfsdk/pwl/cpwl_edit_impl.h"
#include "fpdfsdk/pwl/cpwl_icon.h"
