Move third_party/base/containers/*.h to core/fxcrt/containers
Move adapters.h and containers.h. Shorten the pdfium::base nested
namespace to namespace pdfium.
Bug: pdfium:2127
Change-Id: Ic134fbb491874cd4cece144d9868bc4bc325e4fd
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/116651
Reviewed-by: Thomas Sepez <tsepez@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/edit/cpdf_creator.cpp b/core/fpdfapi/edit/cpdf_creator.cpp
index 7bfd156..5039508 100644
--- a/core/fpdfapi/edit/cpdf_creator.cpp
+++ b/core/fpdfapi/edit/cpdf_creator.cpp
@@ -24,6 +24,7 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fpdfapi/parser/object_tree_traversal_util.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_random.h"
@@ -31,7 +32,6 @@
#include "core/fxcrt/span_util.h"
#include "core/fxcrt/stl_util.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index 20b9111..8080daa 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -39,9 +39,9 @@
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fpdfapi/parser/object_tree_traversal_util.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/span.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "third_party/base/numerics/safe_conversions.h"
diff --git a/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp b/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp
index f83852b..ed2cdb2 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentmanager.cpp
@@ -21,10 +21,10 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/object_tree_traversal_util.h"
+#include "core/fxcrt/containers/adapters.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/abseil-cpp/absl/types/variant.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/adapters.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
CPDF_PageContentManager::CPDF_PageContentManager(
@@ -205,7 +205,7 @@
// In reverse order so as to not change the indexes in the middle of the loop,
// remove the streams.
- for (size_t stream_index : pdfium::base::Reversed(streams_to_remove_)) {
+ for (size_t stream_index : pdfium::Reversed(streams_to_remove_)) {
contents_array->RemoveAt(stream_index);
streams_left.erase(streams_left.begin() + stream_index);
}
diff --git a/core/fpdfapi/font/cpdf_fontglobals.cpp b/core/fpdfapi/font/cpdf_fontglobals.cpp
index aa5386d..3453642 100644
--- a/core/fpdfapi/font/cpdf_fontglobals.cpp
+++ b/core/fpdfapi/font/cpdf_fontglobals.cpp
@@ -16,8 +16,8 @@
#include "core/fpdfapi/font/cpdf_cid2unicodemap.h"
#include "core/fpdfapi/font/cpdf_cmap.h"
#include "core/fpdfapi/parser/cpdf_document.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/font/cpdf_tounicodemap.cpp b/core/fpdfapi/font/cpdf_tounicodemap.cpp
index 2e4dbe5..058e8e1 100644
--- a/core/fpdfapi/font/cpdf_tounicodemap.cpp
+++ b/core/fpdfapi/font/cpdf_tounicodemap.cpp
@@ -15,9 +15,9 @@
#include "core/fpdfapi/parser/cpdf_simple_parser.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index 21bf30a..6fa0364 100644
--- a/core/fpdfapi/page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -32,6 +32,7 @@
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcodec/fx_codec.h"
#include "core/fxcodec/icc/icc_transform.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_2d_size.h"
#include "core/fxcrt/fx_memory_wrappers.h"
@@ -42,7 +43,6 @@
#include "core/fxcrt/stl_util.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
namespace {
diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp
index ca45164..51b225e 100644
--- a/core/fpdfapi/page/cpdf_docpagedata.cpp
+++ b/core/fpdfapi/page/cpdf_docpagedata.cpp
@@ -31,6 +31,7 @@
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fxcodec/icc/icc_transform.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/fx_safe_types.h"
@@ -41,7 +42,6 @@
#include "core/fxge/cfx_unicodeencoding.h"
#include "core/fxge/fx_font.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/page/cpdf_function.cpp b/core/fpdfapi/page/cpdf_function.cpp
index be9ddaf..d7a78cd 100644
--- a/core/fpdfapi/page/cpdf_function.cpp
+++ b/core/fpdfapi/page/cpdf_function.cpp
@@ -18,10 +18,10 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/scoped_set_insertion.h"
#include "core/fxcrt/stl_util.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp
index 7c7a603..359ad30 100644
--- a/core/fpdfapi/page/cpdf_page.cpp
+++ b/core/fpdfapi/page/cpdf_page.cpp
@@ -16,9 +16,9 @@
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_object.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
CPDF_Page::CPDF_Page(CPDF_Document* pDocument,
RetainPtr<CPDF_Dictionary> pPageDict)
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index ef93e69..d3da6a5 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -37,6 +37,7 @@
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcrt/autonuller.h"
#include "core/fxcrt/bytestring.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/scoped_set_insertion.h"
#include "core/fxcrt/span.h"
@@ -44,7 +45,6 @@
#include "core/fxge/cfx_graphstate.h"
#include "core/fxge/cfx_graphstatedata.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
namespace {
diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp
index 6e64e7c..4992d68 100644
--- a/core/fpdfapi/parser/cpdf_array.cpp
+++ b/core/fpdfapi/parser/cpdf_array.cpp
@@ -16,9 +16,9 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_string.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_stream.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
CPDF_Array::CPDF_Array() = default;
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp b/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
index b1b4c79..cd343be 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_cross_ref_avail.cpp
@@ -9,8 +9,8 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
namespace {
diff --git a/core/fpdfapi/parser/cpdf_cross_ref_table.cpp b/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
index c0dc754..05bff75 100644
--- a/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
+++ b/core/fpdfapi/parser/cpdf_cross_ref_table.cpp
@@ -8,8 +8,8 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_parser.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
// static
std::unique_ptr<CPDF_CrossRefTable> CPDF_CrossRefTable::MergeUp(
diff --git a/core/fpdfapi/parser/cpdf_data_avail.cpp b/core/fpdfapi/parser/cpdf_data_avail.cpp
index 9daa95c..8477a95 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_data_avail.cpp
@@ -25,11 +25,11 @@
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcrt/autorestorer.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/stl_util.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "third_party/base/numerics/safe_conversions.h"
diff --git a/core/fpdfapi/parser/cpdf_dictionary.cpp b/core/fpdfapi/parser/cpdf_dictionary.cpp
index 1a5b873..47ce074 100644
--- a/core/fpdfapi/parser/cpdf_dictionary.cpp
+++ b/core/fpdfapi/parser/cpdf_dictionary.cpp
@@ -18,9 +18,9 @@
#include "core/fpdfapi/parser/cpdf_stream.h"
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_stream.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
CPDF_Dictionary::CPDF_Dictionary()
: CPDF_Dictionary(WeakPtr<ByteStringPool>()) {}
diff --git a/core/fpdfapi/parser/cpdf_document.cpp b/core/fpdfapi/parser/cpdf_document.cpp
index f07a4d9..0644065 100644
--- a/core/fpdfapi/parser/cpdf_document.cpp
+++ b/core/fpdfapi/parser/cpdf_document.cpp
@@ -23,13 +23,13 @@
#include "core/fpdfapi/parser/cpdf_stream_acc.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcodec/jbig2/JBig2_DocumentContext.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/scoped_set_insertion.h"
#include "core/fxcrt/span.h"
#include "core/fxcrt/stl_util.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/parser/cpdf_object_avail.cpp b/core/fpdfapi/parser/cpdf_object_avail.cpp
index 8bb3473..1e76947 100644
--- a/core/fpdfapi/parser/cpdf_object_avail.cpp
+++ b/core/fpdfapi/parser/cpdf_object_avail.cpp
@@ -11,8 +11,8 @@
#include "core/fpdfapi/parser/cpdf_object_walker.h"
#include "core/fpdfapi/parser/cpdf_read_validator.h"
#include "core/fpdfapi/parser/cpdf_reference.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
CPDF_ObjectAvail::CPDF_ObjectAvail(RetainPtr<CPDF_ReadValidator> validator,
CPDF_IndirectObjectHolder* holder,
diff --git a/core/fpdfapi/parser/cpdf_parser.cpp b/core/fpdfapi/parser/cpdf_parser.cpp
index 0834400..f7fe7de 100644
--- a/core/fpdfapi/parser/cpdf_parser.cpp
+++ b/core/fpdfapi/parser/cpdf_parser.cpp
@@ -28,6 +28,7 @@
#include "core/fpdfapi/parser/cpdf_syntax_parser.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcrt/autorestorer.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
@@ -35,7 +36,6 @@
#include "core/fxcrt/span.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
using ObjectType = CPDF_CrossRefTable::ObjectType;
diff --git a/core/fpdfapi/parser/cpdf_reference.cpp b/core/fpdfapi/parser/cpdf_reference.cpp
index 8baa6b6..febf9ac 100644
--- a/core/fpdfapi/parser/cpdf_reference.cpp
+++ b/core/fpdfapi/parser/cpdf_reference.cpp
@@ -8,9 +8,9 @@
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_stream.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
CPDF_Reference::CPDF_Reference(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum)
: m_pObjList(pDoc), m_RefObjNum(objnum) {}
diff --git a/core/fpdfapi/parser/cpdf_stream.cpp b/core/fpdfapi/parser/cpdf_stream.cpp
index 0cb4b1e..1c3a2dd 100644
--- a/core/fpdfapi/parser/cpdf_stream.cpp
+++ b/core/fpdfapi/parser/cpdf_stream.cpp
@@ -20,11 +20,11 @@
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fxcrt/cfx_memorystream.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_stream.h"
#include "core/fxcrt/span_util.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
namespace {
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp
index 181a2ff..3fa4aff 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp
@@ -21,12 +21,12 @@
#include "core/fxcodec/fax/faxmodule.h"
#include "core/fxcodec/flate/flatemodule.h"
#include "core/fxcodec/scanlinedecoder.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/span_util.h"
#include "core/fxcrt/utf16.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/parser/object_tree_traversal_util.cpp b/core/fpdfapi/parser/object_tree_traversal_util.cpp
index d319484..dacbf77 100644
--- a/core/fpdfapi/parser/object_tree_traversal_util.cpp
+++ b/core/fpdfapi/parser/object_tree_traversal_util.cpp
@@ -17,9 +17,9 @@
#include "core/fpdfapi/parser/cpdf_document.h"
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_stream.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/unowned_ptr.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 02aa909..6b5a648 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -52,6 +52,7 @@
#include "core/fpdfapi/render/cpdf_textrenderer.h"
#include "core/fpdfapi/render/cpdf_type3cache.h"
#include "core/fxcrt/autorestorer.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_2d_size.h"
#include "core/fxcrt/fx_safe_types.h"
@@ -69,7 +70,6 @@
#include "core/fxge/text_char_pos.h"
#include "core/fxge/text_glyph_pos.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp
index 83dd665..8eff8a7 100644
--- a/core/fpdfdoc/cpdf_formfield.cpp
+++ b/core/fpdfdoc/cpdf_formfield.cpp
@@ -27,9 +27,9 @@
#include "core/fpdfdoc/cpdf_formcontrol.h"
#include "core/fpdfdoc/cpdf_generateap.h"
#include "core/fpdfdoc/cpdf_interactiveform.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/stl_util.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_formfield_unittest.cpp b/core/fpdfdoc/cpdf_formfield_unittest.cpp
index 41b99f5..d1609c5 100644
--- a/core/fpdfdoc/cpdf_formfield_unittest.cpp
+++ b/core/fpdfdoc/cpdf_formfield_unittest.cpp
@@ -19,9 +19,9 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/parser/cpdf_test_document.h"
#include "core/fpdfdoc/cpdf_interactiveform.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_memory.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fpdfdoc/cpdf_interactiveform.cpp b/core/fpdfdoc/cpdf_interactiveform.cpp
index f8b19db..46883f9 100644
--- a/core/fpdfdoc/cpdf_interactiveform.cpp
+++ b/core/fpdfdoc/cpdf_interactiveform.cpp
@@ -29,11 +29,11 @@
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
#include "core/fpdfdoc/cpdf_filespec.h"
#include "core/fpdfdoc/cpdf_formcontrol.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/stl_util.h"
#include "core/fxge/fx_font.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
namespace {
diff --git a/core/fxcrt/BUILD.gn b/core/fxcrt/BUILD.gn
index 4e4cc23..c78378a 100644
--- a/core/fxcrt/BUILD.gn
+++ b/core/fxcrt/BUILD.gn
@@ -45,6 +45,8 @@
"cfx_timer.cpp",
"cfx_timer.h",
"code_point_view.h",
+ "containers/adapters.h",
+ "containers/contains.h",
"data_vector.h",
"fileaccess_iface.h",
"fixed_size_data_vector.h",
diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp
index b7bfd4e..3db0d1d 100644
--- a/core/fxcrt/bytestring_unittest.cpp
+++ b/core/fxcrt/bytestring_unittest.cpp
@@ -12,10 +12,10 @@
#include <set>
#include <vector>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/span.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/containers/contains.h"
namespace fxcrt {
diff --git a/third_party/base/containers/adapters.h b/core/fxcrt/containers/adapters.h
similarity index 74%
rename from third_party/base/containers/adapters.h
rename to core/fxcrt/containers/adapters.h
index 0f65ea0..0dfd97a 100644
--- a/third_party/base/containers/adapters.h
+++ b/core/fxcrt/containers/adapters.h
@@ -1,9 +1,9 @@
-// Copyright 2020 The Chromium Authors. All rights reserved.
+// Copyright 2024 The PDFium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef THIRD_PARTY_BASE_CONTAINERS_ADAPTERS_H_
-#define THIRD_PARTY_BASE_CONTAINERS_ADAPTERS_H_
+#ifndef CORE_FXCRT_CONTAINERS_ADAPTERS_H_
+#define CORE_FXCRT_CONTAINERS_ADAPTERS_H_
#include <stddef.h>
@@ -11,11 +11,10 @@
#include <utility>
namespace pdfium {
-namespace base {
namespace internal {
-// Internal adapter class for implementing base::Reversed.
+// Internal adapter class for implementing Reversed()
template <typename T>
class ReversedAdapter {
public:
@@ -40,7 +39,7 @@
// Example:
//
// std::vector<int> v = ...;
-// for (int i : base::Reversed(v)) {
+// for (int i : pdfium::Reversed(v)) {
// // iterates through v from back to front
// }
template <typename T>
@@ -48,7 +47,6 @@
return internal::ReversedAdapter<T>(t);
}
-} // namespace base
} // namespace pdfium
-#endif // THIRD_PARTY_BASE_CONTAINERS_ADAPTERS_H_
+#endif // CORE_FXCRT_CONTAINERS_ADAPTERS_H_
diff --git a/third_party/base/containers/contains.h b/core/fxcrt/containers/contains.h
similarity index 93%
rename from third_party/base/containers/contains.h
rename to core/fxcrt/containers/contains.h
index 63a06ef..7e295bc 100644
--- a/third_party/base/containers/contains.h
+++ b/core/fxcrt/containers/contains.h
@@ -1,9 +1,9 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
+// Copyright 2024 The PDFium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef THIRD_PARTY_BASE_CONTAINERS_CONTAINS_H_
-#define THIRD_PARTY_BASE_CONTAINERS_CONTAINS_H_
+#ifndef CORE_FXCRT_CONTAINERS_CONTAINS_H_
+#define CORE_FXCRT_CONTAINERS_CONTAINS_H_
#include <algorithm>
#include <iterator>
@@ -23,7 +23,7 @@
template <typename T>
struct HasKeyType<T, std::void_t<typename T::key_type>> : std::true_type {};
-// Utility type traits used for specializing base::Contains() below.
+// Utility type traits used for specializing pdfium::Contains() below.
template <typename Container, typename Element, typename = void>
struct HasFindWithNpos : std::false_type {};
@@ -111,4 +111,4 @@
} // namespace pdfium
-#endif // THIRD_PARTY_BASE_CONTAINERS_CONTAINS_H_
+#endif // CORE_FXCRT_CONTAINERS_CONTAINS_H_
diff --git a/core/fxcrt/css/cfx_csscomputedstyle.cpp b/core/fxcrt/css/cfx_csscomputedstyle.cpp
index cff50db..6335d7a 100644
--- a/core/fxcrt/css/cfx_csscomputedstyle.cpp
+++ b/core/fxcrt/css/cfx_csscomputedstyle.cpp
@@ -6,9 +6,9 @@
#include "core/fxcrt/css/cfx_csscomputedstyle.h"
+#include "core/fxcrt/containers/adapters.h"
#include "core/fxcrt/css/cfx_cssstringvalue.h"
#include "core/fxcrt/css/cfx_cssvaluelist.h"
-#include "third_party/base/containers/adapters.h"
CFX_CSSComputedStyle::CFX_CSSComputedStyle() = default;
@@ -16,7 +16,7 @@
bool CFX_CSSComputedStyle::GetCustomStyle(const WideString& wsName,
WideString* pValue) const {
- for (const auto& prop : pdfium::base::Reversed(m_CustomProperties)) {
+ for (const auto& prop : pdfium::Reversed(m_CustomProperties)) {
if (wsName == prop.name()) {
*pValue = prop.value();
return true;
diff --git a/core/fxcrt/css/cfx_cssstyleselector.cpp b/core/fxcrt/css/cfx_cssstyleselector.cpp
index 1fd93b5..b5d42fb 100644
--- a/core/fxcrt/css/cfx_cssstyleselector.cpp
+++ b/core/fxcrt/css/cfx_cssstyleselector.cpp
@@ -9,6 +9,7 @@
#include <algorithm>
#include <utility>
+#include "core/fxcrt/containers/adapters.h"
#include "core/fxcrt/css/cfx_csscolorvalue.h"
#include "core/fxcrt/css/cfx_csscomputedstyle.h"
#include "core/fxcrt/css/cfx_csscustomproperty.h"
@@ -20,7 +21,6 @@
#include "core/fxcrt/css/cfx_csssyntaxparser.h"
#include "core/fxcrt/css/cfx_cssvaluelist.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/adapters.h"
CFX_CSSStyleSelector::CFX_CSSStyleSelector() = default;
@@ -556,7 +556,7 @@
const RetainPtr<CFX_CSSValueList>& pValue) {
Mask<CFX_CSSTEXTDECORATION> dwDecoration;
for (const RetainPtr<CFX_CSSValue>& val :
- pdfium::base::Reversed(pValue->values())) {
+ pdfium::Reversed(pValue->values())) {
if (val->GetType() != CFX_CSSValue::PrimitiveType::kEnum)
continue;
diff --git a/core/fxcrt/observed_ptr.cpp b/core/fxcrt/observed_ptr.cpp
index 611624a..cbecaf4 100644
--- a/core/fxcrt/observed_ptr.cpp
+++ b/core/fxcrt/observed_ptr.cpp
@@ -4,8 +4,8 @@
#include "core/fxcrt/observed_ptr.h"
+#include "core/fxcrt/containers/contains.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace fxcrt {
diff --git a/core/fxcrt/retain_ptr_unittest.cpp b/core/fxcrt/retain_ptr_unittest.cpp
index b381e78..65fb909 100644
--- a/core/fxcrt/retain_ptr_unittest.cpp
+++ b/core/fxcrt/retain_ptr_unittest.cpp
@@ -9,9 +9,9 @@
#include <utility>
#include <vector>
+#include "core/fxcrt/containers/contains.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/pseudo_retainable.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fxcrt/unowned_ptr_unittest.cpp b/core/fxcrt/unowned_ptr_unittest.cpp
index bbec87d..2f48f17 100644
--- a/core/fxcrt/unowned_ptr_unittest.cpp
+++ b/core/fxcrt/unowned_ptr_unittest.cpp
@@ -10,8 +10,8 @@
#include <set>
#include <utility>
+#include "core/fxcrt/containers/contains.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/containers/contains.h"
#if defined(PDF_USE_PARTITION_ALLOC)
#include "partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.h"
diff --git a/core/fxcrt/widestring_unittest.cpp b/core/fxcrt/widestring_unittest.cpp
index 8749eae..267f5e5 100644
--- a/core/fxcrt/widestring_unittest.cpp
+++ b/core/fxcrt/widestring_unittest.cpp
@@ -9,11 +9,11 @@
#include <vector>
#include "build/build_config.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_string.h"
#include "core/fxcrt/span.h"
#include "core/fxcrt/utf16.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/base/containers/contains.h"
namespace fxcrt {
diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp
index 3052617..6cd28c1 100644
--- a/core/fxge/android/cfpf_skiafontmgr.cpp
+++ b/core/fxge/android/cfpf_skiafontmgr.cpp
@@ -10,6 +10,7 @@
#include <iterator>
#include <utility>
+#include "core/fxcrt/containers/adapters.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_folder.h"
@@ -18,7 +19,6 @@
#include "core/fxge/android/cfpf_skiapathfont.h"
#include "core/fxge/freetype/fx_freetype.h"
#include "core/fxge/fx_font.h"
-#include "third_party/base/containers/adapters.h"
namespace {
@@ -264,7 +264,7 @@
int32_t nMax = -1;
int32_t nGlyphNum = 0;
for (const std::unique_ptr<CFPF_SkiaPathFont>& font :
- pdfium::base::Reversed(m_FontFaces)) {
+ pdfium::Reversed(m_FontFaces)) {
if (!(font->charsets() & FPF_SkiaGetCharset(uCharset)))
continue;
int32_t nFind = 0;
diff --git a/core/fxge/cfx_folderfontinfo.cpp b/core/fxge/cfx_folderfontinfo.cpp
index 324f6e5..30c8f83 100644
--- a/core/fxge/cfx_folderfontinfo.cpp
+++ b/core/fxge/cfx_folderfontinfo.cpp
@@ -12,6 +12,7 @@
#include "build/build_config.h"
#include "core/fxcrt/byteorder.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_folder.h"
@@ -20,7 +21,6 @@
#include "core/fxcrt/fx_system.h"
#include "core/fxge/cfx_fontmapper.h"
#include "core/fxge/fx_font.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index 91197ea..4db24a4 100644
--- a/core/fxge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
@@ -13,6 +13,8 @@
#include <utility>
#include "build/build_config.h"
+#include "core/fxcrt/containers/adapters.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_extension.h"
@@ -24,8 +26,6 @@
#include "core/fxge/fx_font.h"
#include "core/fxge/systemfontinfo_iface.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/adapters.h"
-#include "third_party/base/containers/contains.h"
namespace {
@@ -476,12 +476,12 @@
ByteString CFX_FontMapper::MatchInstalledFonts(const ByteString& norm_name) {
LoadInstalledFonts();
- for (const ByteString& font : pdfium::base::Reversed(m_InstalledTTFonts)) {
+ for (const ByteString& font : pdfium::Reversed(m_InstalledTTFonts)) {
if (TT_NormalizeName(font) == norm_name) {
return font;
}
}
- for (const auto& font_data : pdfium::base::Reversed(m_LocalizedTTFonts)) {
+ for (const auto& font_data : pdfium::Reversed(m_LocalizedTTFonts)) {
if (TT_NormalizeName(font_data.first) == norm_name) {
return font_data.second;
}
diff --git a/core/fxge/win32/cfx_psfonttracker.cpp b/core/fxge/win32/cfx_psfonttracker.cpp
index 103ff6d..aadd059 100644
--- a/core/fxge/win32/cfx_psfonttracker.cpp
+++ b/core/fxge/win32/cfx_psfonttracker.cpp
@@ -4,9 +4,9 @@
#include "core/fxge/win32/cfx_psfonttracker.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxge/cfx_font.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
CFX_PSFontTracker::CFX_PSFontTracker() = default;
diff --git a/fpdfsdk/cpdfsdk_annotiterator.cpp b/fpdfsdk/cpdfsdk_annotiterator.cpp
index cf13574..8439055 100644
--- a/fpdfsdk/cpdfsdk_annotiterator.cpp
+++ b/fpdfsdk/cpdfsdk_annotiterator.cpp
@@ -10,13 +10,13 @@
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
+#include "core/fxcrt/containers/adapters.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/span.h"
#include "core/fxcrt/stl_util.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "fpdfsdk/cpdfsdk_widget.h"
-#include "third_party/base/containers/adapters.h"
-#include "third_party/base/containers/contains.h"
namespace {
@@ -98,7 +98,7 @@
m_Annots.emplace_back(sa[select_idx]);
}
- for (size_t select_idx : pdfium::base::Reversed(aSelect)) {
+ for (size_t select_idx : pdfium::Reversed(aSelect)) {
sa.erase(sa.begin() + select_idx);
}
}
diff --git a/fpdfsdk/cpdfsdk_baannot.cpp b/fpdfsdk/cpdfsdk_baannot.cpp
index 54e5f9c..30f8365 100644
--- a/fpdfsdk/cpdfsdk_baannot.cpp
+++ b/fpdfsdk/cpdfsdk_baannot.cpp
@@ -21,11 +21,11 @@
#include "core/fpdfapi/parser/cpdf_string.h"
#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "core/fpdfapi/parser/fpdf_parser_utility.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxge/cfx_drawutils.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
#include "fpdfsdk/cpdfsdk_pageview.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
CPDFSDK_BAAnnot::CPDFSDK_BAAnnot(CPDF_Annot* pAnnot,
CPDFSDK_PageView* pPageView)
diff --git a/fpdfsdk/cpdfsdk_formfillenvironment.cpp b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
index e3798fc..b6a6ae8 100644
--- a/fpdfsdk/cpdfsdk_formfillenvironment.cpp
+++ b/fpdfsdk/cpdfsdk_formfillenvironment.cpp
@@ -16,6 +16,7 @@
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
#include "core/fpdfdoc/cpdf_nametree.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/stl_util.h"
#include "fpdfsdk/cpdfsdk_helpers.h"
@@ -27,7 +28,6 @@
#include "fxjs/ijs_event_context.h"
#include "fxjs/ijs_runtime.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "third_party/base/numerics/safe_conversions.h"
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp
index 41d62c5..fa2dbd0 100644
--- a/fpdfsdk/cpdfsdk_pageview.cpp
+++ b/fpdfsdk/cpdfsdk_pageview.cpp
@@ -16,6 +16,7 @@
#include "core/fpdfdoc/cpdf_annotlist.h"
#include "core/fpdfdoc/cpdf_interactiveform.h"
#include "core/fxcrt/autorestorer.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/stl_util.h"
#include "fpdfsdk/cpdfsdk_annot.h"
#include "fpdfsdk/cpdfsdk_annotiteration.h"
@@ -24,7 +25,6 @@
#include "fpdfsdk/cpdfsdk_helpers.h"
#include "fpdfsdk/cpdfsdk_interactiveform.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#ifdef PDF_ENABLE_XFA
#include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 31134bb..e943b90 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -10,11 +10,11 @@
#include "constants/form_flags.h"
#include "core/fpdfdoc/cpdf_bafontmap.h"
+#include "core/fxcrt/containers/contains.h"
#include "fpdfsdk/cpdfsdk_widget.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
#include "fpdfsdk/formfiller/cffl_perwindowdata.h"
#include "fpdfsdk/pwl/cpwl_list_box.h"
-#include "third_party/base/containers/contains.h"
CFFL_ListBox::CFFL_ListBox(CFFL_InteractiveFormFiller* pFormFiller,
CPDFSDK_Widget* pWidget)
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index 4005f05..c4b912b 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -30,6 +30,7 @@
#include "core/fpdfdoc/cpdf_formfield.h"
#include "core/fpdfdoc/cpdf_generateap.h"
#include "core/fpdfdoc/cpdf_interactiveform.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/fx_string_wrappers.h"
#include "core/fxcrt/stl_util.h"
@@ -38,7 +39,6 @@
#include "fpdfsdk/cpdfsdk_helpers.h"
#include "fpdfsdk/cpdfsdk_interactiveform.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/memory/ptr_util.h"
#include "third_party/base/numerics/safe_conversions.h"
diff --git a/fpdfsdk/fpdf_annot_embeddertest.cpp b/fpdfsdk/fpdf_annot_embeddertest.cpp
index c927375..ca3efa7 100644
--- a/fpdfsdk/fpdf_annot_embeddertest.cpp
+++ b/fpdfsdk/fpdf_annot_embeddertest.cpp
@@ -15,6 +15,7 @@
#include "core/fpdfapi/page/cpdf_annotcontext.h"
#include "core/fpdfapi/parser/cpdf_array.h"
#include "core/fpdfapi/parser/cpdf_dictionary.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_system.h"
#include "core/fxcrt/span.h"
#include "core/fxge/cfx_defaultrenderdevice.h"
@@ -29,7 +30,6 @@
#include "testing/gmock/include/gmock/gmock-matchers.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/utils/hash.h"
-#include "third_party/base/containers/contains.h"
using pdfium::AnnotationStampWithApChecksum;
diff --git a/fpdfsdk/fpdf_doc.cpp b/fpdfsdk/fpdf_doc.cpp
index e23103a..25a9701 100644
--- a/fpdfsdk/fpdf_doc.cpp
+++ b/fpdfsdk/fpdf_doc.cpp
@@ -25,10 +25,10 @@
#include "core/fpdfdoc/cpdf_dest.h"
#include "core/fpdfdoc/cpdf_linklist.h"
#include "core/fpdfdoc/cpdf_pagelabel.h"
+#include "core/fxcrt/containers/contains.h"
#include "fpdfsdk/cpdfsdk_helpers.h"
#include "public/fpdf_formfill.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
namespace {
diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index af6c3d8..99eac73 100644
--- a/fpdfsdk/fpdf_edittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
@@ -27,6 +27,7 @@
#include "core/fpdfapi/render/cpdf_renderstatus.h"
#include "core/fpdfapi/render/cpdf_textrenderer.h"
#include "core/fpdftext/cpdf_textpage.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_string_wrappers.h"
#include "core/fxcrt/span_util.h"
@@ -41,7 +42,6 @@
#include "public/fpdf_edit.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
// These checks are here because core/ and public/ cannot depend on each other.
diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp
index a2dafdb..c27f9e3 100644
--- a/fpdfsdk/pwl/cpwl_wnd.cpp
+++ b/fpdfsdk/pwl/cpwl_wnd.cpp
@@ -11,13 +11,13 @@
#include <vector>
#include "build/build_config.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/stl_util.h"
#include "core/fxge/cfx_renderdevice.h"
#include "fpdfsdk/pwl/cpwl_scroll_bar.h"
#include "public/fpdf_fwlevent.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index 6be75ad..2eaeb23 100644
--- a/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -24,12 +24,12 @@
#include <iterator>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_2d_size.h"
#include "core/fxcrt/fx_extension.h"
#include "fxbarcode/BC_Writer.h"
#include "fxbarcode/common/BC_CommonBitMatrix.h"
#include "fxbarcode/oned/BC_OneDimWriter.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp
index a9dce0c..20ea213 100644
--- a/fxjs/cjs_global.cpp
+++ b/fxjs/cjs_global.cpp
@@ -10,6 +10,7 @@
#include <utility>
#include <vector>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/span.h"
#include "fxjs/cfx_globaldata.h"
@@ -20,7 +21,6 @@
#include "fxjs/js_define.h"
#include "fxjs/js_resources.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "v8/include/v8-isolate.h"
namespace {
diff --git a/fxjs/gc/heap_unittest.cpp b/fxjs/gc/heap_unittest.cpp
index aa90d00..126dad6 100644
--- a/fxjs/gc/heap_unittest.cpp
+++ b/fxjs/gc/heap_unittest.cpp
@@ -7,10 +7,10 @@
#include <memory>
#include <set>
+#include "core/fxcrt/containers/contains.h"
#include "testing/fxgc_unittest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/v8_test_environment.h"
-#include "third_party/base/containers/contains.h"
#include "v8/include/cppgc/allocation.h"
#include "v8/include/cppgc/persistent.h"
diff --git a/fxjs/global_timer.cpp b/fxjs/global_timer.cpp
index e54e635..ccd0d68 100644
--- a/fxjs/global_timer.cpp
+++ b/fxjs/global_timer.cpp
@@ -9,9 +9,9 @@
#include <map>
#include "core/fxcrt/cfx_timer.h"
+#include "core/fxcrt/containers/contains.h"
#include "fxjs/cjs_app.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
namespace {
diff --git a/fxjs/xfa/cfxjse_engine.cpp b/fxjs/xfa/cfxjse_engine.cpp
index 94fa0f9..85775f3 100644
--- a/fxjs/xfa/cfxjse_engine.cpp
+++ b/fxjs/xfa/cfxjse_engine.cpp
@@ -9,6 +9,7 @@
#include <utility>
#include "core/fxcrt/autorestorer.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/stl_util.h"
#include "core/fxcrt/widetext_buffer.h"
@@ -22,7 +23,6 @@
#include "fxjs/xfa/cfxjse_resolveprocessor.h"
#include "fxjs/xfa/cfxjse_value.h"
#include "fxjs/xfa/cjx_object.h"
-#include "third_party/base/containers/contains.h"
#include "v8/include/v8-function-callback.h"
#include "v8/include/v8-function.h"
#include "v8/include/v8-local-handle.h"
diff --git a/fxjs/xfa/cfxjse_mapmodule.cpp b/fxjs/xfa/cfxjse_mapmodule.cpp
index 1e43a3a..adc2231 100644
--- a/fxjs/xfa/cfxjse_mapmodule.cpp
+++ b/fxjs/xfa/cfxjse_mapmodule.cpp
@@ -6,7 +6,7 @@
#include "fxjs/xfa/cfxjse_mapmodule.h"
-#include "third_party/base/containers/contains.h"
+#include "core/fxcrt/containers/contains.h"
#include "xfa/fxfa/parser/cxfa_measurement.h"
CFXJSE_MapModule::CFXJSE_MapModule() = default;
diff --git a/fxjs/xfa/cfxjse_resolveprocessor.cpp b/fxjs/xfa/cfxjse_resolveprocessor.cpp
index 0535845..295d10a 100644
--- a/fxjs/xfa/cfxjse_resolveprocessor.cpp
+++ b/fxjs/xfa/cfxjse_resolveprocessor.cpp
@@ -10,6 +10,7 @@
#include <utility>
#include <vector>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "fxjs/xfa/cfxjse_engine.h"
#include "fxjs/xfa/cfxjse_nodehelper.h"
@@ -17,7 +18,6 @@
#include "fxjs/xfa/cjx_object.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "xfa/fxfa/parser/cxfa_document.h"
#include "xfa/fxfa/parser/cxfa_localemgr.h"
#include "xfa/fxfa/parser/cxfa_node.h"
diff --git a/fxjs/xfa/cjx_layoutpseudomodel.cpp b/fxjs/xfa/cjx_layoutpseudomodel.cpp
index f270bf5..a2cde16 100644
--- a/fxjs/xfa/cjx_layoutpseudomodel.cpp
+++ b/fxjs/xfa/cjx_layoutpseudomodel.cpp
@@ -9,12 +9,12 @@
#include <set>
#include <utility>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_coordinates.h"
#include "fxjs/fxv8.h"
#include "fxjs/js_resources.h"
#include "fxjs/xfa/cfxjse_class.h"
#include "fxjs/xfa/cfxjse_engine.h"
-#include "third_party/base/containers/contains.h"
#include "v8/include/cppgc/allocation.h"
#include "v8/include/v8-object.h"
#include "xfa/fxfa/cxfa_ffnotify.h"
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index 2d14fe6..ca8be9c 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -10,6 +10,7 @@
#include <tuple>
#include <utility>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_memory.h"
#include "core/fxcrt/span.h"
@@ -26,7 +27,6 @@
#include "fxjs/xfa/cjx_instancemanager.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "v8/include/v8-forward.h"
#include "v8/include/v8-object.h"
#include "v8/include/v8-primitive.h"
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index cc9be36..40b5880 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -11,6 +11,7 @@
#include <vector>
#include "core/fdrm/fx_crypt.h"
+#include "core/fxcrt/containers/contains.h"
#include "public/cpp/fpdf_scopers.h"
#include "public/fpdf_dataavail.h"
#include "public/fpdf_edit.h"
@@ -25,7 +26,6 @@
#include "testing/utils/path_service.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "third_party/base/numerics/checked_math.h"
#include "third_party/base/numerics/safe_conversions.h"
diff --git a/testing/fuzzers/BUILD.gn b/testing/fuzzers/BUILD.gn
index 6baf1ed..43f54a0 100644
--- a/testing/fuzzers/BUILD.gn
+++ b/testing/fuzzers/BUILD.gn
@@ -477,7 +477,7 @@
deps = [
":fuzzer_helper",
":fuzzer_pdf_templates",
- "../../third_party:pdfium_base",
+ "../../core/fxcrt",
]
public_fuzzer = true
}
diff --git a/testing/fuzzers/pdf_xfa_fdp_fuzzer.cc b/testing/fuzzers/pdf_xfa_fdp_fuzzer.cc
index cefd09d..c86fbf3 100644
--- a/testing/fuzzers/pdf_xfa_fdp_fuzzer.cc
+++ b/testing/fuzzers/pdf_xfa_fdp_fuzzer.cc
@@ -7,10 +7,10 @@
#include <string>
#include <vector>
+#include "core/fxcrt/containers/adapters.h"
#include "public/fpdf_formfill.h"
#include "testing/fuzzers/pdf_fuzzer_templates.h"
#include "testing/fuzzers/pdfium_fuzzer_helper.h"
-#include "third_party/base/containers/adapters.h"
class PDFiumXFAFuzzer : public PDFiumFuzzerHelper {
public:
@@ -878,7 +878,7 @@
// Push the tag to the stack so we can close it when done
xml_stack.push_back(tag);
}
- for (const std::string& tag : pdfium::base::Reversed(xml_stack)) {
+ for (const std::string& tag : pdfium::Reversed(xml_stack)) {
xfa_string += "</" + tag + ">";
}
}
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 9aaa440..7a82041 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -556,8 +556,6 @@
"base/check.h",
"base/check_op.h",
"base/component_export.h",
- "base/containers/adapters.h",
- "base/containers/contains.h",
"base/debug/alias.cc",
"base/debug/alias.h",
"base/immediate_crash.h",
diff --git a/xfa/fgas/crt/cfgas_stringformatter.cpp b/xfa/fgas/crt/cfgas_stringformatter.cpp
index d073dd7..a72b043 100644
--- a/xfa/fgas/crt/cfgas_stringformatter.cpp
+++ b/xfa/fgas/crt/cfgas_stringformatter.cpp
@@ -14,9 +14,9 @@
#include <vector>
#include "core/fxcrt/cfx_datetime.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "xfa/fgas/crt/cfgas_decimal.h"
#include "xfa/fgas/crt/locale_mgr_iface.h"
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 4c973bd..c0ed186 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -16,6 +16,7 @@
#include "build/build_config.h"
#include "core/fxcrt/byteorder.h"
#include "core/fxcrt/cfx_read_only_vector_stream.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fixed_size_data_vector.h"
#include "core/fxcrt/fx_codepage.h"
@@ -31,7 +32,6 @@
#include "core/fxge/fx_font.h"
#include "core/fxge/fx_fontencoding.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/font/fgas_fontutils.h"
diff --git a/xfa/fgas/layout/cfgas_rtfbreak.cpp b/xfa/fgas/layout/cfgas_rtfbreak.cpp
index 6a2dff7..9d9a82b 100644
--- a/xfa/fgas/layout/cfgas_rtfbreak.cpp
+++ b/xfa/fgas/layout/cfgas_rtfbreak.cpp
@@ -9,12 +9,12 @@
#include <algorithm>
#include "build/build_config.h"
+#include "core/fxcrt/containers/adapters.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/stl_util.h"
#include "core/fxge/text_char_pos.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/adapters.h"
#include "third_party/base/numerics/safe_math.h"
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/layout/cfgas_char.h"
@@ -495,7 +495,7 @@
int32_t iNetWidth = m_pCurLine->m_iWidth;
int32_t iGapChars = 0;
bool bFind = false;
- for (const TPO& pos : pdfium::base::Reversed(tpos)) {
+ for (const TPO& pos : pdfium::Reversed(tpos)) {
const CFGAS_BreakPiece& ttp = m_pCurLine->m_LinePieces[pos.index];
if (!bFind)
iNetWidth = ttp.GetEndPos();
diff --git a/xfa/fgas/layout/cfgas_txtbreak.cpp b/xfa/fgas/layout/cfgas_txtbreak.cpp
index 129ace0..bcab08f 100644
--- a/xfa/fgas/layout/cfgas_txtbreak.cpp
+++ b/xfa/fgas/layout/cfgas_txtbreak.cpp
@@ -9,13 +9,13 @@
#include <algorithm>
#include "build/build_config.h"
+#include "core/fxcrt/containers/adapters.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/stl_util.h"
#include "core/fxge/text_char_pos.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/adapters.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fgas/layout/cfgas_char.h"
@@ -394,7 +394,7 @@
int32_t iNetWidth = m_pCurLine->m_iWidth;
int32_t iGapChars = 0;
bool bFind = false;
- for (const TPO& pos : pdfium::base::Reversed(tpos)) {
+ for (const TPO& pos : pdfium::Reversed(tpos)) {
const CFGAS_BreakPiece& ttp = m_pCurLine->m_LinePieces[pos.index];
if (!bFind)
iNetWidth = ttp.GetEndPos();
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 5867ec9..ee85eef 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -11,9 +11,9 @@
#include <utility>
#include "core/fxcrt/cfx_datetime.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/stl_util.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "xfa/fde/cfde_textout.h"
#include "xfa/fwl/cfwl_datetimepicker.h"
diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 41f6f31..59f11f4 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -9,6 +9,7 @@
#include <set>
#include <utility>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/fx_extension.h"
#include "core/fxcrt/stl_util.h"
#include "core/fxcrt/xml/cfx_xmlparser.h"
@@ -16,7 +17,6 @@
#include "fxjs/xfa/cfxjse_engine.h"
#include "fxjs/xfa/cjx_object.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "xfa/fxfa/cxfa_ffapp.h"
#include "xfa/fxfa/cxfa_ffbarcode.h"
#include "xfa/fxfa/cxfa_ffcheckbutton.h"
diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index 4da33a0..ad843b1 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -9,11 +9,11 @@
#include <algorithm>
#include <vector>
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/stl_util.h"
#include "fxjs/gc/container_trace.h"
#include "fxjs/xfa/cjx_object.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/contains.h"
#include "xfa/fxfa/cxfa_ffcheckbutton.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
#include "xfa/fxfa/cxfa_ffdocview.h"
diff --git a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
index 2df317e..3f1a8cf 100644
--- a/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
+++ b/xfa/fxfa/layout/cxfa_contentlayoutprocessor.cpp
@@ -10,11 +10,11 @@
#include <utility>
#include <vector>
+#include "core/fxcrt/containers/adapters.h"
#include "core/fxcrt/stl_util.h"
#include "fxjs/gc/container_trace.h"
#include "fxjs/xfa/cjx_object.h"
#include "third_party/base/check.h"
-#include "third_party/base/containers/adapters.h"
#include "third_party/base/notreached.h"
#include "xfa/fxfa/cxfa_ffdoc.h"
#include "xfa/fxfa/cxfa_ffnotify.h"
@@ -1402,7 +1402,7 @@
}
float fTotalHeight = 0;
- for (const auto& item : pdfium::base::Reversed(m_ArrayKeepItems)) {
+ for (const auto& item : pdfium::Reversed(m_ArrayKeepItems)) {
AddLeaderAfterSplit(item);
fTotalHeight += item->m_sSize.height;
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 8d5bb7e..33f08f8 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -19,6 +19,7 @@
#include "core/fxcrt/autorestorer.h"
#include "core/fxcrt/cfx_read_only_string_stream.h"
#include "core/fxcrt/cfx_read_only_vector_stream.h"
+#include "core/fxcrt/containers/contains.h"
#include "core/fxcrt/data_vector.h"
#include "core/fxcrt/fx_codepage.h"
#include "core/fxcrt/fx_extension.h"
@@ -36,7 +37,6 @@
#include "fxjs/xfa/cjx_node.h"
#include "third_party/base/check.h"
#include "third_party/base/check_op.h"
-#include "third_party/base/containers/contains.h"
#include "third_party/base/notreached.h"
#include "xfa/fde/cfde_textout.h"
#include "xfa/fgas/crt/cfgas_decimal.h"
