diff options
108 files changed, 59 insertions, 49 deletions
diff --git a/core/fpdfapi/edit/cpdf_creator.cpp b/core/fpdfapi/edit/cpdf_creator.cpp index a42cfaa852..be63960199 100644 --- a/core/fpdfapi/edit/cpdf_creator.cpp +++ b/core/fpdfapi/edit/cpdf_creator.cpp @@ -22,6 +22,7 @@ #include "core/fpdfapi/parser/fpdf_parser_utility.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_random.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" namespace { diff --git a/core/fpdfapi/edit/cpdf_encryptor.cpp b/core/fpdfapi/edit/cpdf_encryptor.cpp index c74e53ed75..a89de72836 100644 --- a/core/fpdfapi/edit/cpdf_encryptor.cpp +++ b/core/fpdfapi/edit/cpdf_encryptor.cpp @@ -7,7 +7,6 @@ #include "core/fpdfapi/edit/cpdf_encryptor.h" #include "core/fpdfapi/parser/cpdf_crypto_handler.h" -#include "third_party/base/ptr_util.h" CPDF_Encryptor::CPDF_Encryptor(CPDF_CryptoHandler* pHandler, int objnum) : m_pHandler(pHandler), m_ObjNum(objnum) { diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp index 02aea78074..946364d6d7 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp @@ -32,6 +32,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" #include "core/fpdfapi/parser/fpdf_parser_utility.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "third_party/skia_shared/SkFloatToDecimal.h" diff --git a/core/fpdfapi/font/cpdf_fontencoding.cpp b/core/fpdfapi/font/cpdf_fontencoding.cpp index 921d5842b8..865a1b7bb7 100644 --- a/core/fpdfapi/font/cpdf_fontencoding.cpp +++ b/core/fpdfapi/font/cpdf_fontencoding.cpp @@ -14,6 +14,7 @@ #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" #include "core/fxge/fx_freetype.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp index dde452e915..5993c1c7cb 100644 --- a/core/fpdfapi/font/cpdf_type3font.cpp +++ b/core/fpdfapi/font/cpdf_type3font.cpp @@ -15,6 +15,7 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fxcrt/fx_system.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfapi/page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp index 725a17348b..c1cdf392e0 100644 --- a/core/fpdfapi/page/cpdf_contentmark.cpp +++ b/core/fpdfapi/page/cpdf_contentmark.cpp @@ -10,6 +10,7 @@ #include <utility> #include "core/fpdfapi/parser/cpdf_dictionary.h" +#include "third_party/base/ptr_util.h" CPDF_ContentMark::CPDF_ContentMark() {} diff --git a/core/fpdfapi/page/cpdf_docpagedata.cpp b/core/fpdfapi/page/cpdf_docpagedata.cpp index 9ee8d588e4..bc1c1c5a60 100644 --- a/core/fpdfapi/page/cpdf_docpagedata.cpp +++ b/core/fpdfapi/page/cpdf_docpagedata.cpp @@ -25,6 +25,7 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CPDF_DocPageData::CPDF_DocPageData(CPDF_Document* pPDFDoc) diff --git a/core/fpdfapi/page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp index 7503ccb625..5d8e1f2342 100644 --- a/core/fpdfapi/page/cpdf_meshstream.cpp +++ b/core/fpdfapi/page/cpdf_meshstream.cpp @@ -10,6 +10,7 @@ #include "core/fpdfapi/page/cpdf_function.h" #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" namespace { diff --git a/core/fpdfapi/page/cpdf_psfunc.cpp b/core/fpdfapi/page/cpdf_psfunc.cpp index 13d76aeb10..dd2b05c763 100644 --- a/core/fpdfapi/page/cpdf_psfunc.cpp +++ b/core/fpdfapi/page/cpdf_psfunc.cpp @@ -7,7 +7,6 @@ #include "core/fpdfapi/page/cpdf_psfunc.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" -#include "third_party/base/ptr_util.h" CPDF_PSFunc::CPDF_PSFunc() : CPDF_Function(Type::kType4PostScript) {} diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp index a083c93618..037e72c5e0 100644 --- a/core/fpdfapi/page/cpdf_streamparser.cpp +++ b/core/fpdfapi/page/cpdf_streamparser.cpp @@ -31,6 +31,7 @@ #include "core/fxcodec/codec/ccodec_scanlinedecoder.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_extension.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp index 68b301e283..79be0c8bae 100644 --- a/core/fpdfapi/parser/cpdf_array.cpp +++ b/core/fpdfapi/parser/cpdf_array.cpp @@ -16,6 +16,7 @@ #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fxcrt/fx_stream.h" #include "third_party/base/logging.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CPDF_Array::CPDF_Array() {} diff --git a/core/fpdfapi/parser/cpdf_dictionary.cpp b/core/fpdfapi/parser/cpdf_dictionary.cpp index 4357efaff3..9c06e42804 100644 --- a/core/fpdfapi/parser/cpdf_dictionary.cpp +++ b/core/fpdfapi/parser/cpdf_dictionary.cpp @@ -20,6 +20,7 @@ #include "core/fpdfapi/parser/fpdf_parser_utility.h" #include "core/fxcrt/fx_stream.h" #include "third_party/base/logging.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CPDF_Dictionary::CPDF_Dictionary() diff --git a/core/fpdfapi/parser/cpdf_hint_tables.cpp b/core/fpdfapi/parser/cpdf_hint_tables.cpp index 43c3138605..9f53e3aaa2 100644 --- a/core/fpdfapi/parser/cpdf_hint_tables.cpp +++ b/core/fpdfapi/parser/cpdf_hint_tables.cpp @@ -20,6 +20,7 @@ #include "core/fxcrt/cfx_bitstream.h" #include "core/fxcrt/fx_safe_types.h" #include "third_party/base/numerics/safe_conversions.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp index 42e312ca64..4c15a9ed80 100644 --- a/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp +++ b/core/fpdfapi/parser/cpdf_indirect_object_holder.cpp @@ -12,6 +12,7 @@ #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_parser.h" #include "third_party/base/logging.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_object.cpp b/core/fpdfapi/parser/cpdf_object.cpp index 1e2b2f680f..a32a5c2eed 100644 --- a/core/fpdfapi/parser/cpdf_object.cpp +++ b/core/fpdfapi/parser/cpdf_object.cpp @@ -15,6 +15,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fxcrt/fx_string.h" #include "third_party/base/logging.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CPDF_Object::~CPDF_Object() {} diff --git a/core/fpdfapi/parser/cpdf_object_avail.cpp b/core/fpdfapi/parser/cpdf_object_avail.cpp index 35e7f45850..1c1ab153b0 100644 --- a/core/fpdfapi/parser/cpdf_object_avail.cpp +++ b/core/fpdfapi/parser/cpdf_object_avail.cpp @@ -11,6 +11,7 @@ #include "core/fpdfapi/parser/cpdf_object_walker.h" #include "core/fpdfapi/parser/cpdf_read_validator.h" #include "core/fpdfapi/parser/cpdf_reference.h" +#include "third_party/base/ptr_util.h" CPDF_ObjectAvail::CPDF_ObjectAvail(CPDF_ReadValidator* validator, CPDF_IndirectObjectHolder* holder, diff --git a/core/fpdfapi/parser/cpdf_object_stream.cpp b/core/fpdfapi/parser/cpdf_object_stream.cpp index 7e4b4ae81c..49d2b0242a 100644 --- a/core/fpdfapi/parser/cpdf_object_stream.cpp +++ b/core/fpdfapi/parser/cpdf_object_stream.cpp @@ -14,6 +14,7 @@ #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.h" #include "core/fxcrt/cfx_memorystream.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" // static diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp index 768ce98265..ca01949c65 100644 --- a/core/fpdfapi/parser/cpdf_object_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp @@ -20,6 +20,7 @@ #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fpdfapi/parser/cpdf_string.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_object_walker.cpp b/core/fpdfapi/parser/cpdf_object_walker.cpp index 91638662c3..6d6d489e02 100644 --- a/core/fpdfapi/parser/cpdf_object_walker.cpp +++ b/core/fpdfapi/parser/cpdf_object_walker.cpp @@ -9,6 +9,7 @@ #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_stream.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_parser_unittest.cpp index 28c907a101..33fdd73643 100644 --- a/core/fpdfapi/parser/cpdf_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_parser_unittest.cpp @@ -17,6 +17,7 @@ #include "core/fxcrt/retain_ptr.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_security_handler.cpp b/core/fpdfapi/parser/cpdf_security_handler.cpp index bb2296666a..079aeefef0 100644 --- a/core/fpdfapi/parser/cpdf_security_handler.cpp +++ b/core/fpdfapi/parser/cpdf_security_handler.cpp @@ -19,6 +19,7 @@ #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fxcrt/fx_extension.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfapi/render/cpdf_devicebuffer.cpp b/core/fpdfapi/render/cpdf_devicebuffer.cpp index 4c8da1c327..b29db0054b 100644 --- a/core/fpdfapi/render/cpdf_devicebuffer.cpp +++ b/core/fpdfapi/render/cpdf_devicebuffer.cpp @@ -13,7 +13,6 @@ #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_dib.h" -#include "third_party/base/ptr_util.h" CPDF_DeviceBuffer::CPDF_DeviceBuffer() {} diff --git a/core/fpdfapi/render/cpdf_pagerendercache.cpp b/core/fpdfapi/render/cpdf_pagerendercache.cpp index f58837a794..ba334ad01d 100644 --- a/core/fpdfapi/render/cpdf_pagerendercache.cpp +++ b/core/fpdfapi/render/cpdf_pagerendercache.cpp @@ -14,6 +14,7 @@ #include "core/fpdfapi/render/cpdf_imagecacheentry.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" #include "core/fxge/dib/cfx_dibitmap.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index 4ff853dc9a..fb70daffd8 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -23,6 +23,7 @@ #include "core/fpdfdoc/cpdf_formcontrol.h" #include "core/fpdfdoc/cpdf_interform.h" #include "core/fpdfdoc/cpvt_generateap.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfdoc/cpdf_nametree_unittest.cpp b/core/fpdfdoc/cpdf_nametree_unittest.cpp index 38c3140b90..0ceab24e48 100644 --- a/core/fpdfdoc/cpdf_nametree_unittest.cpp +++ b/core/fpdfdoc/cpdf_nametree_unittest.cpp @@ -8,6 +8,7 @@ #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/cpdf_string.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfdoc/cpdf_structtree.cpp b/core/fpdfdoc/cpdf_structtree.cpp index 4f8ce0eea6..04b074f39f 100644 --- a/core/fpdfdoc/cpdf_structtree.cpp +++ b/core/fpdfdoc/cpdf_structtree.cpp @@ -13,6 +13,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfdoc/cpdf_numbertree.h" #include "core/fpdfdoc/cpdf_structelement.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fpdfdoc/cpvt_wordinfo.cpp b/core/fpdfdoc/cpvt_wordinfo.cpp index 5465645be8..7712bcd8cf 100644 --- a/core/fpdfdoc/cpvt_wordinfo.cpp +++ b/core/fpdfdoc/cpvt_wordinfo.cpp @@ -7,7 +7,6 @@ #include "core/fpdfdoc/cpvt_wordinfo.h" #include "core/fxcrt/fx_codepage.h" -#include "third_party/base/ptr_util.h" CPVT_WordInfo::CPVT_WordInfo() : Word(0), diff --git a/core/fxcodec/bmp/cfx_bmpdecompressor.cpp b/core/fxcodec/bmp/cfx_bmpdecompressor.cpp index 35b76f2343..b99a11c9f9 100644 --- a/core/fxcodec/bmp/cfx_bmpdecompressor.cpp +++ b/core/fxcodec/bmp/cfx_bmpdecompressor.cpp @@ -15,7 +15,6 @@ #include "core/fxcrt/fx_system.h" #include "third_party/base/logging.h" #include "third_party/base/numerics/safe_math.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fxcodec/codec/ccodec_iccmodule.cpp b/core/fxcodec/codec/ccodec_iccmodule.cpp index 74937b2807..a15e72d5fd 100644 --- a/core/fxcodec/codec/ccodec_iccmodule.cpp +++ b/core/fxcodec/codec/ccodec_iccmodule.cpp @@ -11,6 +11,7 @@ #include <vector> #include "core/fxcodec/codec/codec_int.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fxcodec/codec/ccodec_iccmodule.h b/core/fxcodec/codec/ccodec_iccmodule.h index 64cfb26f9d..432ca1c508 100644 --- a/core/fxcodec/codec/ccodec_iccmodule.h +++ b/core/fxcodec/codec/ccodec_iccmodule.h @@ -12,7 +12,6 @@ #include "core/fxcodec/fx_codec_def.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" #if defined(USE_SYSTEM_LCMS2) diff --git a/core/fxcodec/gif/cfx_lzwdecompressor.cpp b/core/fxcodec/gif/cfx_lzwdecompressor.cpp index a23106bb37..5708d11cbf 100644 --- a/core/fxcodec/gif/cfx_lzwdecompressor.cpp +++ b/core/fxcodec/gif/cfx_lzwdecompressor.cpp @@ -12,7 +12,6 @@ #include <utility> #include "third_party/base/numerics/safe_math.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" std::unique_ptr<CFX_LZWDecompressor> CFX_LZWDecompressor::Create( diff --git a/core/fxcrt/cfx_seekablestreamproxy.cpp b/core/fxcrt/cfx_seekablestreamproxy.cpp index eb5874b7a2..98ed8b1603 100644 --- a/core/fxcrt/cfx_seekablestreamproxy.cpp +++ b/core/fxcrt/cfx_seekablestreamproxy.cpp @@ -19,7 +19,6 @@ #include "core/fxcrt/cfx_memorystream.h" #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fxcrt/fx_bidi.cpp b/core/fxcrt/fx_bidi.cpp index caf12fa8dd..672e2d9dae 100644 --- a/core/fxcrt/fx_bidi.cpp +++ b/core/fxcrt/fx_bidi.cpp @@ -9,7 +9,6 @@ #include <algorithm> #include "core/fxcrt/fx_unicode.h" -#include "third_party/base/ptr_util.h" #ifdef PDF_ENABLE_XFA #include "core/fxcrt/fx_extension.h" diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp index 8320b45db4..8e78e4d789 100644 --- a/core/fxcrt/fx_extension.cpp +++ b/core/fxcrt/fx_extension.cpp @@ -11,7 +11,6 @@ #include <limits> #include "third_party/base/compiler_specific.h" -#include "third_party/base/ptr_util.h" time_t (*time_func)() = []() -> time_t { return time(nullptr); }; diff --git a/core/fxcrt/xml/cfx_xmlchardata.cpp b/core/fxcrt/xml/cfx_xmlchardata.cpp index 307d319537..d5fae18cd9 100644 --- a/core/fxcrt/xml/cfx_xmlchardata.cpp +++ b/core/fxcrt/xml/cfx_xmlchardata.cpp @@ -7,7 +7,6 @@ #include "core/fxcrt/xml/cfx_xmlchardata.h" #include "core/fxcrt/xml/cfx_xmldocument.h" -#include "third_party/base/ptr_util.h" CFX_XMLCharData::CFX_XMLCharData(const WideString& wsCData) : CFX_XMLText(wsCData) {} diff --git a/core/fxcrt/xml/cfx_xmldocument.cpp b/core/fxcrt/xml/cfx_xmldocument.cpp index 73f19d1c7d..1c6656d1cf 100644 --- a/core/fxcrt/xml/cfx_xmldocument.cpp +++ b/core/fxcrt/xml/cfx_xmldocument.cpp @@ -6,7 +6,6 @@ #include "core/fxcrt/fx_system.h" #include "core/fxcrt/xml/cfx_xmlinstruction.h" -#include "third_party/base/ptr_util.h" CFX_XMLDocument::CFX_XMLDocument() { root_ = CreateNode<CFX_XMLElement>(L"root"); diff --git a/core/fxcrt/xml/cfx_xmlelement.cpp b/core/fxcrt/xml/cfx_xmlelement.cpp index bd24091205..f5031624e8 100644 --- a/core/fxcrt/xml/cfx_xmlelement.cpp +++ b/core/fxcrt/xml/cfx_xmlelement.cpp @@ -13,7 +13,6 @@ #include "core/fxcrt/xml/cfx_xmlchardata.h" #include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmltext.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CFX_XMLElement::CFX_XMLElement(const WideString& wsTag) diff --git a/core/fxcrt/xml/cfx_xmlinstruction.cpp b/core/fxcrt/xml/cfx_xmlinstruction.cpp index 32841fb68e..9c00e38528 100644 --- a/core/fxcrt/xml/cfx_xmlinstruction.cpp +++ b/core/fxcrt/xml/cfx_xmlinstruction.cpp @@ -11,7 +11,6 @@ #include "core/fxcrt/fx_codepage.h" #include "core/fxcrt/fx_extension.h" #include "core/fxcrt/xml/cfx_xmldocument.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CFX_XMLInstruction::CFX_XMLInstruction(const WideString& wsTarget) diff --git a/core/fxcrt/xml/cfx_xmlparser_unittest.cpp b/core/fxcrt/xml/cfx_xmlparser_unittest.cpp index 86d340ea83..d948faff24 100644 --- a/core/fxcrt/xml/cfx_xmlparser_unittest.cpp +++ b/core/fxcrt/xml/cfx_xmlparser_unittest.cpp @@ -13,7 +13,6 @@ #include "core/fxcrt/xml/cfx_xmlinstruction.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" -#include "third_party/base/ptr_util.h" class CFX_XMLParserTest : public testing::Test { public: diff --git a/core/fxcrt/xml/cfx_xmltext.cpp b/core/fxcrt/xml/cfx_xmltext.cpp index 73f0477482..c835680580 100644 --- a/core/fxcrt/xml/cfx_xmltext.cpp +++ b/core/fxcrt/xml/cfx_xmltext.cpp @@ -7,7 +7,6 @@ #include "core/fxcrt/xml/cfx_xmltext.h" #include "core/fxcrt/xml/cfx_xmldocument.h" -#include "third_party/base/ptr_util.h" CFX_XMLText::CFX_XMLText(const WideString& wsText) : CFX_XMLNode(), m_wsText(wsText) {} diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 62b9b9e618..b752f83420 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -16,7 +16,6 @@ #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/dib/cfx_dibitmap.h" #include "core/fxge/fx_freetype.h" -#include "third_party/base/ptr_util.h" #include "core/fxge/apple/apple_int.h" #ifndef CGFLOAT_IS_DOUBLE diff --git a/core/fxge/dib/cfx_bitmapstorer.cpp b/core/fxge/dib/cfx_bitmapstorer.cpp index d5b26f28b7..2d85a2ed7b 100644 --- a/core/fxge/dib/cfx_bitmapstorer.cpp +++ b/core/fxge/dib/cfx_bitmapstorer.cpp @@ -8,7 +8,6 @@ #include <utility> -#include "third_party/base/ptr_util.h" CFX_BitmapStorer::CFX_BitmapStorer() {} diff --git a/core/fxge/dib/cfx_dibbase.cpp b/core/fxge/dib/cfx_dibbase.cpp index 79150ba616..65b7e5eded 100644 --- a/core/fxge/dib/cfx_dibbase.cpp +++ b/core/fxge/dib/cfx_dibbase.cpp @@ -18,7 +18,6 @@ #include "core/fxge/dib/cfx_imagestretcher.h" #include "core/fxge/dib/cfx_imagetransformer.h" #include "third_party/base/logging.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fxge/dib/cfx_dibitmap.cpp b/core/fxge/dib/cfx_dibitmap.cpp index 0dbf47cbf8..3a6eca8228 100644 --- a/core/fxge/dib/cfx_dibitmap.cpp +++ b/core/fxge/dib/cfx_dibitmap.cpp @@ -13,7 +13,6 @@ #include "core/fxcodec/fx_codec.h" #include "core/fxge/cfx_cliprgn.h" #include "core/fxge/dib/cfx_scanlinecompositor.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp index 2fd3cc05e5..8df1322e97 100644 --- a/core/fxge/dib/fx_dib_main.cpp +++ b/core/fxge/dib/fx_dib_main.cpp @@ -10,7 +10,6 @@ #include <utility> #include "core/fxcrt/fx_extension.h" -#include "third_party/base/ptr_util.h" #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ static_assert(sizeof(FX_COLORREF) == sizeof(COLORREF), diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp index 57780344ab..a9f6974271 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp @@ -16,7 +16,6 @@ #include "core/fxge/cfx_pathdata.h" #include "core/fxge/win32/cfx_windowsdib.h" #include "core/fxge/win32/win32_int.h" -#include "third_party/base/ptr_util.h" // Has to come before gdiplus.h namespace Gdiplus { diff --git a/core/fxge/win32/fx_win32_print.cpp b/core/fxge/win32/fx_win32_print.cpp index 83a1627087..4d8452db74 100644 --- a/core/fxge/win32/fx_win32_print.cpp +++ b/core/fxge/win32/fx_win32_print.cpp @@ -19,7 +19,6 @@ #include "core/fxge/fx_freetype.h" #include "core/fxge/win32/cpsoutput.h" #include "core/fxge/win32/win32_int.h" -#include "third_party/base/ptr_util.h" #if defined(PDFIUM_PRINT_TEXT_WITH_GDI) namespace { diff --git a/fpdfsdk/cfx_systemhandler.cpp b/fpdfsdk/cfx_systemhandler.cpp index e33e433531..7b4cf1a674 100644 --- a/fpdfsdk/cfx_systemhandler.cpp +++ b/fpdfsdk/cfx_systemhandler.cpp @@ -19,6 +19,7 @@ #include "fpdfsdk/cpdfsdk_pageview.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cffl_formfiller.h" +#include "third_party/base/ptr_util.h" CFX_SystemHandler::CFX_SystemHandler(CPDFSDK_FormFillEnvironment* pFormFillEnv) : m_pFormFillEnv(pFormFillEnv) {} diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index b7b7109402..bd3c7fa1a3 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -35,6 +35,7 @@ #include "fpdfsdk/ipdfsdk_annothandler.h" #include "fxjs/ijs_event_context.h" #include "fxjs/ijs_runtime.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp index 748f5d2989..f2e7c840f8 100644 --- a/fpdfsdk/formfiller/cba_fontmap.cpp +++ b/fpdfsdk/formfiller/cba_fontmap.cpp @@ -20,6 +20,7 @@ #include "core/fpdfdoc/cpdf_formfield.h" #include "core/fxge/cfx_substfont.h" #include "fpdfsdk/cpdfsdk_annot.h" +#include "third_party/base/ptr_util.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, CFX_SystemHandler* pSystemHandler) diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp index e0f0f3fbe5..8de88a66f3 100644 --- a/fpdfsdk/formfiller/cffl_combobox.cpp +++ b/fpdfsdk/formfiller/cffl_combobox.cpp @@ -12,7 +12,6 @@ #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" CFFL_ComboBox::CFFL_ComboBox(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget) diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp index cef2a45011..329224d2b2 100644 --- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp +++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp @@ -23,6 +23,7 @@ #include "fpdfsdk/formfiller/cffl_pushbutton.h" #include "fpdfsdk/formfiller/cffl_radiobutton.h" #include "fpdfsdk/formfiller/cffl_textfield.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CFFL_InteractiveFormFiller::CFFL_InteractiveFormFiller( diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp index c05400d13c..472501df2c 100644 --- a/fpdfsdk/formfiller/cffl_listbox.cpp +++ b/fpdfsdk/formfiller/cffl_listbox.cpp @@ -12,7 +12,6 @@ #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" #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp index 8c261f8f36..6f9ec03f44 100644 --- a/fpdfsdk/formfiller/cffl_textfield.cpp +++ b/fpdfsdk/formfiller/cffl_textfield.cpp @@ -10,7 +10,6 @@ #include "fpdfsdk/cpdfsdk_formfillenvironment.h" #include "fpdfsdk/cpdfsdk_widget.h" #include "fpdfsdk/formfiller/cba_fontmap.h" -#include "third_party/base/ptr_util.h" CFFL_TextField::CFFL_TextField(CPDFSDK_FormFillEnvironment* pApp, CPDFSDK_Widget* pWidget) diff --git a/fpdfsdk/formfiller/cffl_textobject.cpp b/fpdfsdk/formfiller/cffl_textobject.cpp index df2f5e5a92..1c44a4b292 100644 --- a/fpdfsdk/formfiller/cffl_textobject.cpp +++ b/fpdfsdk/formfiller/cffl_textobject.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "fpdfsdk/formfiller/cffl_textobject.h" +#include "third_party/base/ptr_util.h" CPWL_Wnd* CFFL_TextObject::ResetPDFWindow(CPDFSDK_PageView* pPageView, bool bRestoreValue) { diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp index 10e4d989ad..fe7d9fa012 100644 --- a/fpdfsdk/fpdf_annot.cpp +++ b/fpdfsdk/fpdf_annot.cpp @@ -24,6 +24,7 @@ #include "core/fxge/cfx_color.h" #include "fpdfsdk/cpdf_annotcontext.h" #include "fpdfsdk/cpdfsdk_helpers.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/fpdfsdk/fpdf_attachment.cpp b/fpdfsdk/fpdf_attachment.cpp index 692e5ddb76..e73678d751 100644 --- a/fpdfsdk/fpdf_attachment.cpp +++ b/fpdfsdk/fpdf_attachment.cpp @@ -22,6 +22,7 @@ #include "core/fxcrt/cfx_datetime.h" #include "core/fxcrt/fx_extension.h" #include "fpdfsdk/cpdfsdk_helpers.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/fpdfsdk/fpdf_catalog_unittest.cpp b/fpdfsdk/fpdf_catalog_unittest.cpp index b6b65cba29..c6ee79072c 100644 --- a/fpdfsdk/fpdf_catalog_unittest.cpp +++ b/fpdfsdk/fpdf_catalog_unittest.cpp @@ -16,6 +16,7 @@ #include "public/cpp/fpdf_scopers.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" +#include "third_party/base/ptr_util.h" class CPDF_TestDocument final : public CPDF_Document { public: diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 13ec33b490..17a6b63ba7 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -31,6 +31,7 @@ #include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_formfill.h" #include "third_party/base/logging.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp index e99f00aee1..32ea6db607 100644 --- a/fpdfsdk/fpdf_edittext.cpp +++ b/fpdfsdk/fpdf_edittext.cpp @@ -28,6 +28,7 @@ #include "core/fxge/fx_font.h" #include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_edit.h" +#include "third_party/base/ptr_util.h" // These checks are here because core/ and public/ cannot depend on each other. static_assert(static_cast<int>(TextRenderingMode::MODE_FILL) == diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index ce9ae28e95..94c84dfb8f 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -13,6 +13,7 @@ #include "core/fpdfdoc/cpdf_metadata.h" #include "core/fxcrt/fx_extension.h" #include "fpdfsdk/cpdfsdk_helpers.h" +#include "third_party/base/ptr_util.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp index bc0344feeb..29d81c2c66 100644 --- a/fpdfsdk/fpdf_flatten.cpp +++ b/fpdfsdk/fpdf_flatten.cpp @@ -24,6 +24,7 @@ #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fpdfdoc/cpdf_annot.h" #include "fpdfsdk/cpdfsdk_helpers.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" enum FPDF_TYPE { MAX, MIN }; diff --git a/fpdfsdk/fpdf_save.cpp b/fpdfsdk/fpdf_save.cpp index 4c171caed9..16d7da2101 100644 --- a/fpdfsdk/fpdf_save.cpp +++ b/fpdfsdk/fpdf_save.cpp @@ -23,6 +23,7 @@ #include "fpdfsdk/cpdfsdk_helpers.h" #include "public/fpdf_edit.h" #include "third_party/base/optional.h" +#include "third_party/base/ptr_util.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp index 33f49b8e1b..d1f7fceebc 100644 --- a/fpdfsdk/fpdf_transformpage.cpp +++ b/fpdfsdk/fpdf_transformpage.cpp @@ -23,6 +23,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fxge/cfx_pathdata.h" #include "fpdfsdk/cpdfsdk_helpers.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp index 6c5ff63394..7a4befdc0f 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.cpp @@ -13,7 +13,6 @@ #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h" #include "public/fpdf_formfill.h" #include "third_party/base/compiler_specific.h" -#include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffdocview.h" #include "xfa/fxfa/cxfa_ffpageview.h" diff --git a/fpdfsdk/pwl/cpwl_appstream.cpp b/fpdfsdk/pwl/cpwl_appstream.cpp index aa007b8d6f..8ced563161 100644 --- a/fpdfsdk/pwl/cpwl_appstream.cpp +++ b/fpdfsdk/pwl/cpwl_appstream.cpp @@ -26,6 +26,7 @@ #include "fpdfsdk/pwl/cpwl_edit_impl.h" #include "fpdfsdk/pwl/cpwl_icon.h" #include "fpdfsdk/pwl/cpwl_wnd.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/fpdfsdk/pwl/cpwl_list_impl.cpp b/fpdfsdk/pwl/cpwl_list_impl.cpp index 8795a67bcd..b7081c0075 100644 --- a/fpdfsdk/pwl/cpwl_list_impl.cpp +++ b/fpdfsdk/pwl/cpwl_list_impl.cpp @@ -13,6 +13,7 @@ #include "core/fxcrt/fx_extension.h" #include "fpdfsdk/pwl/cpwl_edit_impl.h" #include "fpdfsdk/pwl/cpwl_list_box.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CPWL_ListCtrl::Item::Item() diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 095fae9b26..1fc2bd8157 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -12,7 +12,6 @@ #include "core/fxge/cfx_renderdevice.h" #include "fpdfsdk/pwl/cpwl_scroll_bar.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" namespace { diff --git a/fxbarcode/common/BC_CommonBitMatrix.cpp b/fxbarcode/common/BC_CommonBitMatrix.cpp index c21dfb36af..edfadb6ee9 100644 --- a/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -27,7 +27,6 @@ #include "fxbarcode/common/BC_CommonBitArray.h" #include "fxbarcode/utils.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" CBC_CommonBitMatrix::CBC_CommonBitMatrix() {} diff --git a/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp index 9ad053db28..34a5716008 100644 --- a/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/fxbarcode/oned/BC_OneDimWriter.cpp @@ -33,7 +33,6 @@ #include "core/fxge/cfx_renderdevice.h" #include "core/fxge/cfx_unicodeencodingex.h" #include "fxbarcode/BC_Writer.h" -#include "third_party/base/ptr_util.h" CBC_OneDimWriter::CBC_OneDimWriter() = default; diff --git a/fxjs/cfxjs_engine.cpp b/fxjs/cfxjs_engine.cpp index a4a85df0a2..e127bbed7a 100644 --- a/fxjs/cfxjs_engine.cpp +++ b/fxjs/cfxjs_engine.cpp @@ -13,6 +13,7 @@ #include "core/fxcrt/unowned_ptr.h" #include "fxjs/cfxjse_runtimedata.h" #include "fxjs/cjs_object.h" +#include "third_party/base/ptr_util.h" class CFXJS_PerObjectData; diff --git a/fxjs/cjs_app.cpp b/fxjs/cjs_app.cpp index 08d4e4e1c8..7c9cb229a7 100644 --- a/fxjs/cjs_app.cpp +++ b/fxjs/cjs_app.cpp @@ -14,6 +14,7 @@ #include "fxjs/global_timer.h" #include "fxjs/ijs_event_context.h" #include "fxjs/js_resources.h" +#include "third_party/base/ptr_util.h" #ifdef PDF_ENABLE_XFA #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h" diff --git a/fxjs/cjs_field.cpp b/fxjs/cjs_field.cpp index 45baf613b0..2777fd8cf9 100644 --- a/fxjs/cjs_field.cpp +++ b/fxjs/cjs_field.cpp @@ -21,6 +21,7 @@ #include "fxjs/cjs_document.h" #include "fxjs/cjs_icon.h" #include "fxjs/js_resources.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/fxjs/cjs_global.cpp b/fxjs/cjs_global.cpp index ecf06f10cb..a683ed8bfc 100644 --- a/fxjs/cjs_global.cpp +++ b/fxjs/cjs_global.cpp @@ -19,6 +19,7 @@ #include "fxjs/cjs_object.h" #include "fxjs/js_define.h" #include "fxjs/js_resources.h" +#include "third_party/base/ptr_util.h" namespace { diff --git a/fxjs/cjs_runtime.cpp b/fxjs/cjs_runtime.cpp index e7de7abd8f..2f4fe01474 100644 --- a/fxjs/cjs_runtime.cpp +++ b/fxjs/cjs_runtime.cpp @@ -40,6 +40,7 @@ #include "fxjs/cjs_zoomtype.h" #include "fxjs/js_define.h" #include "public/fpdf_formfill.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA diff --git a/testing/fuzzers/pdf_bidi_fuzzer.cc b/testing/fuzzers/pdf_bidi_fuzzer.cc index 8e52688a10..9a0e720812 100644 --- a/testing/fuzzers/pdf_bidi_fuzzer.cc +++ b/testing/fuzzers/pdf_bidi_fuzzer.cc @@ -7,6 +7,7 @@ #include "core/fxcrt/fx_bidi.h" #include "core/fxcrt/widestring.h" #include "core/fxge/cfx_font.h" +#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" #include "xfa/fgas/font/cfgas_fontmgr.h" #include "xfa/fgas/font/cfgas_gefont.h" diff --git a/testing/fuzzers/pdf_cmap_fuzzer.cc b/testing/fuzzers/pdf_cmap_fuzzer.cc index 0c0ff11f36..7d35fd0ac9 100644 --- a/testing/fuzzers/pdf_cmap_fuzzer.cc +++ b/testing/fuzzers/pdf_cmap_fuzzer.cc @@ -5,7 +5,6 @@ #include <cstdint> #include "core/fpdfapi/font/cpdf_cmap.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { diff --git a/testing/fuzzers/pdf_xml_fuzzer.cc b/testing/fuzzers/pdf_xml_fuzzer.cc index efc171671c..cbf436daf5 100644 --- a/testing/fuzzers/pdf_xml_fuzzer.cc +++ b/testing/fuzzers/pdf_xml_fuzzer.cc @@ -12,7 +12,6 @@ #include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlparser.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { diff --git a/testing/unit_test_main.cpp b/testing/unit_test_main.cpp index 2bc14b9ba4..6c1aa1a22c 100644 --- a/testing/unit_test_main.cpp +++ b/testing/unit_test_main.cpp @@ -9,6 +9,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" +#include "third_party/base/ptr_util.h" #ifdef PDF_ENABLE_V8 #include "v8/include/v8-platform.h" diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index 51eb5279b9..ed360a614d 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -564,7 +564,6 @@ jumbo_source_set("pdfium_base") { "base/numerics/safe_math.h", "base/numerics/safe_math_impl.h", "base/optional.h", - "base/ptr_util.h", "base/span.h", "base/stl_util.h", "base/sys_byteorder.h", diff --git a/xfa/fde/cfde_texteditengine.cpp b/xfa/fde/cfde_texteditengine.cpp index cd6681fd21..5a2a904ada 100644 --- a/xfa/fde/cfde_texteditengine.cpp +++ b/xfa/fde/cfde_texteditengine.cpp @@ -9,6 +9,7 @@ #include <algorithm> #include <limits> +#include "third_party/base/ptr_util.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fde/cfde_wordbreak_data.h" #include "xfa/fgas/font/cfgas_gefont.h" diff --git a/xfa/fgas/layout/cfx_txtbreak.cpp b/xfa/fgas/layout/cfx_txtbreak.cpp index 89d2122494..86146a1d58 100644 --- a/xfa/fgas/layout/cfx_txtbreak.cpp +++ b/xfa/fgas/layout/cfx_txtbreak.cpp @@ -11,7 +11,6 @@ #include "core/fxcrt/fx_arabic.h" #include "core/fxcrt/fx_bidi.h" #include "core/fxcrt/fx_memory.h" -#include "third_party/base/ptr_util.h" #include "xfa/fde/cfde_texteditengine.h" #include "xfa/fgas/font/cfgas_gefont.h" #include "xfa/fgas/layout/cfx_linebreak.h" diff --git a/xfa/fwl/cfwl_combolist.cpp b/xfa/fwl/cfwl_combolist.cpp index 5aae3cddd4..2083802730 100644 --- a/xfa/fwl/cfwl_combolist.cpp +++ b/xfa/fwl/cfwl_combolist.cpp @@ -9,7 +9,6 @@ #include <memory> #include <utility> -#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_combobox.h" #include "xfa/fwl/cfwl_comboedit.h" #include "xfa/fwl/cfwl_listbox.h" diff --git a/xfa/fwl/cfwl_datetimeedit.cpp b/xfa/fwl/cfwl_datetimeedit.cpp index ceb30c7a17..147650dc6f 100644 --- a/xfa/fwl/cfwl_datetimeedit.cpp +++ b/xfa/fwl/cfwl_datetimeedit.cpp @@ -9,7 +9,6 @@ #include <memory> #include <utility> -#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_datetimepicker.h" #include "xfa/fwl/cfwl_messagemouse.h" #include "xfa/fwl/cfwl_widgetmgr.h" diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp index 4e52d8bbfd..e4fe3c41c6 100644 --- a/xfa/fwl/cfwl_scrollbar.cpp +++ b/xfa/fwl/cfwl_scrollbar.cpp @@ -10,7 +10,6 @@ #include <memory> #include <utility> -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fwl/cfwl_messagemouse.h" #include "xfa/fwl/cfwl_messagemousewheel.h" diff --git a/xfa/fxfa/cxfa_ffbarcode_unittest.cpp b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp index 455b5a6ac0..6236b10446 100644 --- a/xfa/fxfa/cxfa_ffbarcode_unittest.cpp +++ b/xfa/fxfa/cxfa_ffbarcode_unittest.cpp @@ -5,7 +5,6 @@ #include "xfa/fxfa/cxfa_ffbarcode.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/base/ptr_util.h" TEST(XFA_FFBarcode, GetBarcodeTypeByName) { EXPECT_EQ(nullptr, CXFA_FFBarcode::GetBarcodeTypeByName(L"")); diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp index af5d216790..493b1d4b31 100644 --- a/xfa/fxfa/cxfa_ffcombobox.cpp +++ b/xfa/fxfa/cxfa_ffcombobox.cpp @@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_combobox.h" #include "xfa/fwl/cfwl_eventselectchanged.h" #include "xfa/fwl/cfwl_notedriver.h" diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp index 35ec007d30..6eaa372d9e 100644 --- a/xfa/fxfa/cxfa_ffdatetimeedit.cpp +++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp @@ -8,6 +8,7 @@ #include <utility> +#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_datetimepicker.h" #include "xfa/fwl/cfwl_eventselectchanged.h" #include "xfa/fwl/cfwl_notedriver.h" diff --git a/xfa/fxfa/cxfa_fflistbox.cpp b/xfa/fxfa/cxfa_fflistbox.cpp index 583efacdea..440e6d213b 100644 --- a/xfa/fxfa/cxfa_fflistbox.cpp +++ b/xfa/fxfa/cxfa_fflistbox.cpp @@ -10,6 +10,7 @@ #include <utility> #include <vector> +#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_listbox.h" #include "xfa/fwl/cfwl_notedriver.h" #include "xfa/fwl/cfwl_widget.h" diff --git a/xfa/fxfa/cxfa_ffnotify.cpp b/xfa/fxfa/cxfa_ffnotify.cpp index 715877c620..c32953f5bc 100644 --- a/xfa/fxfa/cxfa_ffnotify.cpp +++ b/xfa/fxfa/cxfa_ffnotify.cpp @@ -8,6 +8,7 @@ #include <utility> +#include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffapp.h" #include "xfa/fxfa/cxfa_ffarc.h" #include "xfa/fxfa/cxfa_ffbarcode.h" diff --git a/xfa/fxfa/cxfa_ffnumericedit.cpp b/xfa/fxfa/cxfa_ffnumericedit.cpp index d0321e8ca5..1f193f304c 100644 --- a/xfa/fxfa/cxfa_ffnumericedit.cpp +++ b/xfa/fxfa/cxfa_ffnumericedit.cpp @@ -8,6 +8,7 @@ #include <utility> +#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_edit.h" #include "xfa/fwl/cfwl_eventvalidate.h" #include "xfa/fwl/cfwl_notedriver.h" diff --git a/xfa/fxfa/cxfa_ffpasswordedit.cpp b/xfa/fxfa/cxfa_ffpasswordedit.cpp index f49a990650..1a45f0513e 100644 --- a/xfa/fxfa/cxfa_ffpasswordedit.cpp +++ b/xfa/fxfa/cxfa_ffpasswordedit.cpp @@ -8,6 +8,7 @@ #include <utility> +#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_edit.h" #include "xfa/fwl/cfwl_notedriver.h" #include "xfa/fxfa/cxfa_ffdoc.h" diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp index 88b48b4b65..385a369e4e 100644 --- a/xfa/fxfa/cxfa_fftextedit.cpp +++ b/xfa/fxfa/cxfa_fftextedit.cpp @@ -8,6 +8,7 @@ #include <utility> +#include "third_party/base/ptr_util.h" #include "xfa/fwl/cfwl_datetimepicker.h" #include "xfa/fwl/cfwl_edit.h" #include "xfa/fwl/cfwl_eventtarget.h" diff --git a/xfa/fxfa/cxfa_fontmgr.cpp b/xfa/fxfa/cxfa_fontmgr.cpp index 92fe77a52c..62c3e86dcf 100644 --- a/xfa/fxfa/cxfa_fontmgr.cpp +++ b/xfa/fxfa/cxfa_fontmgr.cpp @@ -15,7 +15,6 @@ #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" -#include "third_party/base/ptr_util.h" #include "xfa/fgas/font/cfgas_defaultfontmanager.h" #include "xfa/fgas/font/cfgas_gefont.h" #include "xfa/fgas/font/fgas_fontutils.h" diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp index 73f03ce41c..7db4ed48d5 100644 --- a/xfa/fxfa/cxfa_fwltheme.cpp +++ b/xfa/fxfa/cxfa_fwltheme.cpp @@ -7,6 +7,7 @@ #include "xfa/fxfa/cxfa_fwltheme.h" #include "core/fxcrt/fx_codepage.h" +#include "third_party/base/ptr_util.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fgas/font/cfgas_gefont.h" #include "xfa/fwl/cfwl_barcode.h" diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp index 53a70a2f65..fd0e2d596f 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -15,7 +15,6 @@ #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" #include "fxjs/xfa/cjx_object.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" #include "xfa/fde/cfde_textout.h" #include "xfa/fxfa/cxfa_eventparam.h" diff --git a/xfa/fxfa/fm2js/cxfa_fmlexer.cpp b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp index fd3a61eb21..018540f8a8 100644 --- a/xfa/fxfa/fm2js/cxfa_fmlexer.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp @@ -9,7 +9,6 @@ #include <algorithm> #include "core/fxcrt/fx_extension.h" -#include "third_party/base/ptr_util.h" #include "third_party/icu/source/common/unicode/uchar.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_defaultui.cpp b/xfa/fxfa/parser/cxfa_defaultui.cpp index 776dd5d180..c619d05561 100644 --- a/xfa/fxfa/parser/cxfa_defaultui.cpp +++ b/xfa/fxfa/parser/cxfa_defaultui.cpp @@ -7,7 +7,6 @@ #include "xfa/fxfa/parser/cxfa_defaultui.h" #include "fxjs/xfa/cjx_defaultui.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index c9369894a6..19e9ede20f 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -14,6 +14,7 @@ #include "fxjs/cfxjse_engine.h" #include "fxjs/xfa/cjx_object.h" #include "third_party/base/compiler_specific.h" +#include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffdoc.h" #include "xfa/fxfa/cxfa_ffnotify.h" #include "xfa/fxfa/parser/cscript_datawindow.h" diff --git a/xfa/fxfa/parser/cxfa_document_parser.cpp b/xfa/fxfa/parser/cxfa_document_parser.cpp index 7fd4ff1570..c6b3f54636 100644 --- a/xfa/fxfa/parser/cxfa_document_parser.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser.cpp @@ -22,7 +22,6 @@ #include "core/fxcrt/xml/cfx_xmltext.h" #include "fxjs/xfa/cjx_object.h" #include "third_party/base/logging.h" -#include "third_party/base/ptr_util.h" #include "xfa/fxfa/fxfa.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_node.h" diff --git a/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp b/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp index 7ce2efe954..7af43e14ad 100644 --- a/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp +++ b/xfa/fxfa/parser/cxfa_document_parser_unittest.cpp @@ -7,6 +7,7 @@ #include "core/fxcrt/cfx_readonlymemorystream.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" +#include "third_party/base/ptr_util.h" #include "xfa/fxfa/parser/cxfa_document.h" class CXFA_DocumentParserTest : public testing::Test { diff --git a/xfa/fxfa/parser/cxfa_image.cpp b/xfa/fxfa/parser/cxfa_image.cpp index fb67980aef..a91dcd21db 100644 --- a/xfa/fxfa/parser/cxfa_image.cpp +++ b/xfa/fxfa/parser/cxfa_image.cpp @@ -7,7 +7,6 @@ #include "xfa/fxfa/parser/cxfa_image.h" #include "fxjs/xfa/cjx_image.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_object.cpp b/xfa/fxfa/parser/cxfa_object.cpp index 6daf3aa7b4..44b5729b8d 100644 --- a/xfa/fxfa/parser/cxfa_object.cpp +++ b/xfa/fxfa/parser/cxfa_object.cpp @@ -11,7 +11,6 @@ #include "core/fxcrt/fx_extension.h" #include "fxjs/cfxjse_engine.h" #include "fxjs/cfxjse_value.h" -#include "third_party/base/ptr_util.h" #include "xfa/fxfa/cxfa_ffnotify.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_node.h" diff --git a/xfa/fxfa/parser/cxfa_passwordedit.cpp b/xfa/fxfa/parser/cxfa_passwordedit.cpp index ceea47b341..d16d35ac91 100644 --- a/xfa/fxfa/parser/cxfa_passwordedit.cpp +++ b/xfa/fxfa/parser/cxfa_passwordedit.cpp @@ -7,7 +7,6 @@ #include "xfa/fxfa/parser/cxfa_passwordedit.h" #include "fxjs/xfa/cjx_passwordedit.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_timestamp.cpp b/xfa/fxfa/parser/cxfa_timestamp.cpp index d37b9f7f3b..246d581e56 100644 --- a/xfa/fxfa/parser/cxfa_timestamp.cpp +++ b/xfa/fxfa/parser/cxfa_timestamp.cpp @@ -7,7 +7,6 @@ #include "xfa/fxfa/parser/cxfa_timestamp.h" #include "fxjs/xfa/cjx_timestamp.h" -#include "third_party/base/ptr_util.h" namespace { diff --git a/xfa/fxfa/parser/cxfa_xmllocale.cpp b/xfa/fxfa/parser/cxfa_xmllocale.cpp index 20557dd59c..7d3eb7718a 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.cpp +++ b/xfa/fxfa/parser/cxfa_xmllocale.cpp @@ -13,6 +13,7 @@ #include "core/fxcrt/xml/cfx_xmldocument.h" #include "core/fxcrt/xml/cfx_xmlelement.h" #include "core/fxcrt/xml/cfx_xmlparser.h" +#include "third_party/base/ptr_util.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_localemgr.h" #include "xfa/fxfa/parser/cxfa_nodelocale.h" diff --git a/xfa/fxfa/parser/cxfa_xmllocale.h b/xfa/fxfa/parser/cxfa_xmllocale.h index 07d417ed28..e0e165b9a4 100644 --- a/xfa/fxfa/parser/cxfa_xmllocale.h +++ b/xfa/fxfa/parser/cxfa_xmllocale.h @@ -10,7 +10,6 @@ #include <memory> #include "core/fxcrt/locale_iface.h" -#include "third_party/base/ptr_util.h" #include "third_party/base/span.h" class CFX_XMLDocument; diff --git a/xfa/fxgraphics/cxfa_gepath.cpp b/xfa/fxgraphics/cxfa_gepath.cpp index 88372f72ac..a1fee1547a 100644 --- a/xfa/fxgraphics/cxfa_gepath.cpp +++ b/xfa/fxgraphics/cxfa_gepath.cpp @@ -7,7 +7,6 @@ #include "xfa/fxgraphics/cxfa_gepath.h" #include "core/fxge/cfx_pathdata.h" -#include "third_party/base/ptr_util.h" CXFA_GEPath::CXFA_GEPath() {} |