From bcd1e70175b6bbbcb9d9466c579e0538f34297c6 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 31 Aug 2017 13:19:18 -0400 Subject: Remove fx_basic.h This CL removes the fx_basic.h header and fixes up includes as needed. Change-Id: I49af32a8327bdbcda40c50a61ffbd75d06609040 Reviewed-on: https://pdfium-review.googlesource.com/12670 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp | 1 - core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp | 1 - core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp | 1 - core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp | 1 - core/fpdfapi/cpdf_modulemgr.h | 2 -- core/fpdfapi/edit/cpdf_creator.h | 2 +- core/fpdfapi/edit/cpdf_pagecontentgenerator.h | 2 +- core/fpdfapi/font/cfx_cttgsubtable.h | 1 - core/fpdfapi/font/cpdf_cmap.h | 1 - core/fpdfapi/font/cpdf_cmapparser.h | 1 - core/fpdfapi/font/cpdf_fontglobals.h | 1 - core/fpdfapi/font/cpdf_type3char.h | 1 + core/fpdfapi/page/cpdf_clippath.h | 1 - core/fpdfapi/page/cpdf_colorstate.h | 1 - core/fpdfapi/page/cpdf_contentmark.h | 1 - core/fpdfapi/page/cpdf_generalstate.h | 2 +- core/fpdfapi/page/cpdf_image.cpp | 1 + core/fpdfapi/page/cpdf_page.h | 1 - core/fpdfapi/page/cpdf_pageobjectholder.h | 1 + core/fpdfapi/page/cpdf_sampledfunc.cpp | 1 + core/fpdfapi/page/cpdf_textstate.h | 1 - core/fpdfapi/parser/cfdf_document.h | 2 +- core/fpdfapi/parser/cpdf_array.cpp | 1 + core/fpdfapi/parser/cpdf_array.h | 1 - core/fpdfapi/parser/cpdf_boolean.cpp | 1 + core/fpdfapi/parser/cpdf_data_avail.h | 1 - core/fpdfapi/parser/cpdf_dictionary.cpp | 1 + core/fpdfapi/parser/cpdf_document.h | 1 - core/fpdfapi/parser/cpdf_name.cpp | 1 + core/fpdfapi/parser/cpdf_null.cpp | 1 + core/fpdfapi/parser/cpdf_number.cpp | 1 + core/fpdfapi/parser/cpdf_object.h | 2 +- core/fpdfapi/parser/cpdf_object_unittest.cpp | 14 ++++++-------- core/fpdfapi/parser/cpdf_parser.h | 4 +++- core/fpdfapi/parser/cpdf_read_validator.h | 1 + core/fpdfapi/parser/cpdf_reference.cpp | 1 + core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp | 1 - core/fpdfapi/parser/cpdf_stream.cpp | 1 + core/fpdfapi/parser/cpdf_stream.h | 2 +- core/fpdfapi/parser/cpdf_string.cpp | 1 + core/fpdfapi/parser/cpdf_syntax_parser.h | 1 - core/fpdfapi/parser/fpdf_parser_decode.h | 2 +- core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp | 1 - core/fpdfapi/parser/fpdf_parser_utility.cpp | 1 + core/fpdfapi/parser/fpdf_parser_utility.h | 2 +- core/fpdfapi/render/cpdf_imageloader.cpp | 1 - core/fpdfapi/render/cpdf_imageloader.h | 2 +- core/fpdfapi/render/cpdf_rendercontext.h | 2 +- 48 files changed, 34 insertions(+), 41 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp index dc8a21776d..101c316c3b 100644 --- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp +++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp @@ -10,7 +10,6 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/font/cpdf_fontglobals.h" #include "core/fpdfapi/page/cpdf_pagemodule.h" -#include "core/fxcrt/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { {"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None, diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp index 1591da1eca..5776b18c0e 100644 --- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp +++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp @@ -10,7 +10,6 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/font/cpdf_fontglobals.h" #include "core/fpdfapi/page/cpdf_pagemodule.h" -#include "core/fxcrt/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = { {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None, diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp index 8fd4fcb7c4..ba8f02dcdf 100644 --- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp +++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp @@ -10,7 +10,6 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/font/cpdf_fontglobals.h" #include "core/fpdfapi/page/cpdf_pagemodule.h" -#include "core/fxcrt/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222, diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp index 8e9784e5de..12dbec6a74 100644 --- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp +++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp @@ -10,7 +10,6 @@ #include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/font/cpdf_fontglobals.h" #include "core/fpdfapi/page/cpdf_pagemodule.h" -#include "core/fxcrt/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = { {"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467, diff --git a/core/fpdfapi/cpdf_modulemgr.h b/core/fpdfapi/cpdf_modulemgr.h index 82566ba282..6b83bc755d 100644 --- a/core/fpdfapi/cpdf_modulemgr.h +++ b/core/fpdfapi/cpdf_modulemgr.h @@ -10,8 +10,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" - class CCodec_FaxModule; class CCodec_FlateModule; class CCodec_IccModule; diff --git a/core/fpdfapi/edit/cpdf_creator.h b/core/fpdfapi/edit/cpdf_creator.h index f141c3880a..d97ee01d73 100644 --- a/core/fpdfapi/edit/cpdf_creator.h +++ b/core/fpdfapi/edit/cpdf_creator.h @@ -13,7 +13,7 @@ #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_stream.h" class CPDF_Array; class CPDF_CryptoHandler; diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h index 5295d8747b..518d358451 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.h +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.h @@ -11,7 +11,7 @@ #include #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" class CPDF_Document; diff --git a/core/fpdfapi/font/cfx_cttgsubtable.h b/core/fpdfapi/font/cfx_cttgsubtable.h index aac3f86c07..f8fd6c5c5e 100644 --- a/core/fpdfapi/font/cfx_cttgsubtable.h +++ b/core/fpdfapi/font/cfx_cttgsubtable.h @@ -13,7 +13,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" #include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" diff --git a/core/fpdfapi/font/cpdf_cmap.h b/core/fpdfapi/font/cpdf_cmap.h index b47b12d531..f4d6ca9113 100644 --- a/core/fpdfapi/font/cpdf_cmap.h +++ b/core/fpdfapi/font/cpdf_cmap.h @@ -11,7 +11,6 @@ #include "core/fpdfapi/font/cpdf_cidfont.h" #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_CMapManager; struct FXCMAP_CMap; diff --git a/core/fpdfapi/font/cpdf_cmapparser.h b/core/fpdfapi/font/cpdf_cmapparser.h index 184ef75043..b0a0ced30f 100644 --- a/core/fpdfapi/font/cpdf_cmapparser.h +++ b/core/fpdfapi/font/cpdf_cmapparser.h @@ -14,7 +14,6 @@ #include "core/fpdfapi/font/cpdf_cidfont.h" #include "core/fpdfapi/font/cpdf_cmap.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_CMapParser { public: diff --git a/core/fpdfapi/font/cpdf_fontglobals.h b/core/fpdfapi/font/cpdf_fontglobals.h index b930aa2905..6f9b0918db 100644 --- a/core/fpdfapi/font/cpdf_fontglobals.h +++ b/core/fpdfapi/font/cpdf_fontglobals.h @@ -13,7 +13,6 @@ #include "core/fpdfapi/cmaps/cmap_int.h" #include "core/fpdfapi/font/cfx_stockfontarray.h" #include "core/fpdfapi/font/cpdf_cmapmanager.h" -#include "core/fxcrt/fx_basic.h" class CPDF_FontGlobals { public: diff --git a/core/fpdfapi/font/cpdf_type3char.h b/core/fpdfapi/font/cpdf_type3char.h index 18c564150c..9f2f94f603 100644 --- a/core/fpdfapi/font/cpdf_type3char.h +++ b/core/fpdfapi/font/cpdf_type3char.h @@ -9,6 +9,7 @@ #include +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" diff --git a/core/fpdfapi/page/cpdf_clippath.h b/core/fpdfapi/page/cpdf_clippath.h index 8493a9ccd9..0105270b35 100644 --- a/core/fpdfapi/page/cpdf_clippath.h +++ b/core/fpdfapi/page/cpdf_clippath.h @@ -13,7 +13,6 @@ #include "core/fpdfapi/page/cpdf_path.h" #include "core/fxcrt/cfx_shared_copy_on_write.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" class CPDF_Path; diff --git a/core/fpdfapi/page/cpdf_colorstate.h b/core/fpdfapi/page/cpdf_colorstate.h index 0862f489bd..cf63d24ea3 100644 --- a/core/fpdfapi/page/cpdf_colorstate.h +++ b/core/fpdfapi/page/cpdf_colorstate.h @@ -9,7 +9,6 @@ #include "core/fpdfapi/page/cpdf_color.h" #include "core/fxcrt/cfx_shared_copy_on_write.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_system.h" class CPDF_Color; diff --git a/core/fpdfapi/page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h index 5782addc93..ab966c0728 100644 --- a/core/fpdfapi/page/cpdf_contentmark.h +++ b/core/fpdfapi/page/cpdf_contentmark.h @@ -11,7 +11,6 @@ #include "core/fpdfapi/page/cpdf_contentmarkitem.h" #include "core/fxcrt/cfx_shared_copy_on_write.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_system.h" class CPDF_Dictionary; diff --git a/core/fpdfapi/page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h index 356841690b..b5b48a94cd 100644 --- a/core/fpdfapi/page/cpdf_generalstate.h +++ b/core/fpdfapi/page/cpdf_generalstate.h @@ -9,8 +9,8 @@ #include "core/fxcrt/cfx_shared_copy_on_write.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" #include "core/fxge/fx_dib.h" class CPDF_Object; diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index 233b303481..a551bd1811 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -25,6 +25,7 @@ #include "core/fpdfapi/render/cpdf_dibsource.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fxcodec/fx_codec.h" +#include "core/fxcrt/fx_stream.h" #include "core/fxge/fx_dib.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/ptr_util.h" diff --git a/core/fpdfapi/page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h index 82df60ce9f..1891e651be 100644 --- a/core/fpdfapi/page/cpdf_page.h +++ b/core/fpdfapi/page/cpdf_page.h @@ -10,7 +10,6 @@ #include #include "core/fpdfapi/page/cpdf_pageobjectholder.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "core/fxcrt/fx_system.h" diff --git a/core/fpdfapi/page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h index 0862369809..9ac1a3bdba 100644 --- a/core/fpdfapi/page/cpdf_pageobjectholder.h +++ b/core/fpdfapi/page/cpdf_pageobjectholder.h @@ -14,6 +14,7 @@ #include "core/fpdfapi/page/cpdf_pageobjectlist.h" #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_coordinates.h" +#include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" class IFX_PauseIndicator; diff --git a/core/fpdfapi/page/cpdf_sampledfunc.cpp b/core/fpdfapi/page/cpdf_sampledfunc.cpp index f1cba97d30..91c6b5a70a 100644 --- a/core/fpdfapi/page/cpdf_sampledfunc.cpp +++ b/core/fpdfapi/page/cpdf_sampledfunc.cpp @@ -8,6 +8,7 @@ #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fxcrt/cfx_fixedbufgrow.h" +#include "core/fxcrt/fx_extension.h" #include "core/fxcrt/fx_safe_types.h" namespace { diff --git a/core/fpdfapi/page/cpdf_textstate.h b/core/fpdfapi/page/cpdf_textstate.h index ff3ab8dd6c..e7239e1f91 100644 --- a/core/fpdfapi/page/cpdf_textstate.h +++ b/core/fpdfapi/page/cpdf_textstate.h @@ -9,7 +9,6 @@ #include "core/fxcrt/cfx_shared_copy_on_write.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_Document; class CPDF_Font; diff --git a/core/fpdfapi/parser/cfdf_document.h b/core/fpdfapi/parser/cfdf_document.h index 45bf83d426..d58f93ced4 100644 --- a/core/fpdfapi/parser/cfdf_document.h +++ b/core/fpdfapi/parser/cfdf_document.h @@ -12,9 +12,9 @@ #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_Dictionary; +class IFX_SeekableReadStream; class CFDF_Document : public CPDF_IndirectObjectHolder { public: diff --git a/core/fpdfapi/parser/cpdf_array.cpp b/core/fpdfapi/parser/cpdf_array.cpp index 5d079a38b4..a0957b6c2b 100644 --- a/core/fpdfapi/parser/cpdf_array.cpp +++ b/core/fpdfapi/parser/cpdf_array.cpp @@ -14,6 +14,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/logging.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h index ed5d3e33fd..d1be233652 100644 --- a/core/fpdfapi/parser/cpdf_array.h +++ b/core/fpdfapi/parser/cpdf_array.h @@ -15,7 +15,6 @@ #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_object.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" #include "third_party/base/ptr_util.h" diff --git a/core/fpdfapi/parser/cpdf_boolean.cpp b/core/fpdfapi/parser/cpdf_boolean.cpp index eb01c06332..2633c876d3 100644 --- a/core/fpdfapi/parser/cpdf_boolean.cpp +++ b/core/fpdfapi/parser/cpdf_boolean.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fpdfapi/parser/cpdf_boolean.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/ptr_util.h" CPDF_Boolean::CPDF_Boolean() : m_bValue(false) {} diff --git a/core/fpdfapi/parser/cpdf_data_avail.h b/core/fpdfapi/parser/cpdf_data_avail.h index 1f2a1f2475..1fcdaf034e 100644 --- a/core/fpdfapi/parser/cpdf_data_avail.h +++ b/core/fpdfapi/parser/cpdf_data_avail.h @@ -14,7 +14,6 @@ #include "core/fpdfapi/parser/cpdf_parser.h" #include "core/fpdfapi/parser/cpdf_syntax_parser.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_Dictionary; class CPDF_HintTables; diff --git a/core/fpdfapi/parser/cpdf_dictionary.cpp b/core/fpdfapi/parser/cpdf_dictionary.cpp index a339a8becd..4c035871df 100644 --- a/core/fpdfapi/parser/cpdf_dictionary.cpp +++ b/core/fpdfapi/parser/cpdf_dictionary.cpp @@ -17,6 +17,7 @@ #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/logging.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h index 87d40fd61b..cc5076379e 100644 --- a/core/fpdfapi/parser/cpdf_document.h +++ b/core/fpdfapi/parser/cpdf_document.h @@ -17,7 +17,6 @@ #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_object.h" #include "core/fpdfdoc/cpdf_linklist.h" -#include "core/fxcrt/fx_basic.h" class CFX_Font; class CFX_Matrix; diff --git a/core/fpdfapi/parser/cpdf_name.cpp b/core/fpdfapi/parser/cpdf_name.cpp index 0287b7ab17..ae33bc7fa0 100644 --- a/core/fpdfapi/parser/cpdf_name.cpp +++ b/core/fpdfapi/parser/cpdf_name.cpp @@ -7,6 +7,7 @@ #include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/ptr_util.h" CPDF_Name::CPDF_Name(CFX_WeakPtr pPool, diff --git a/core/fpdfapi/parser/cpdf_null.cpp b/core/fpdfapi/parser/cpdf_null.cpp index 7c1cdac486..1074efd863 100644 --- a/core/fpdfapi/parser/cpdf_null.cpp +++ b/core/fpdfapi/parser/cpdf_null.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fpdfapi/parser/cpdf_null.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/ptr_util.h" CPDF_Null::CPDF_Null() {} diff --git a/core/fpdfapi/parser/cpdf_number.cpp b/core/fpdfapi/parser/cpdf_number.cpp index 73d689fffe..50c48d6cb8 100644 --- a/core/fpdfapi/parser/cpdf_number.cpp +++ b/core/fpdfapi/parser/cpdf_number.cpp @@ -5,6 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fpdfapi/parser/cpdf_number.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/ptr_util.h" CPDF_Number::CPDF_Number() : m_bInteger(true), m_Integer(0) {} diff --git a/core/fpdfapi/parser/cpdf_object.h b/core/fpdfapi/parser/cpdf_object.h index 04b77ec706..82d7801cce 100644 --- a/core/fpdfapi/parser/cpdf_object.h +++ b/core/fpdfapi/parser/cpdf_object.h @@ -11,7 +11,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" @@ -24,6 +23,7 @@ class CPDF_Number; class CPDF_Reference; class CPDF_Stream; class CPDF_String; +class IFX_ArchiveStream; class CPDF_Object { public: diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp index ffaa2648a3..dd170ba90e 100644 --- a/core/fpdfapi/parser/cpdf_object_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp @@ -2,23 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include +#include +#include +#include + #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_boolean.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" +#include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" #include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/parser/cpdf_null.h" #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_stream.h" #include "core/fpdfapi/parser/cpdf_string.h" - -#include -#include -#include -#include - -#include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" -#include "core/fxcrt/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/core/fpdfapi/parser/cpdf_parser.h b/core/fpdfapi/parser/cpdf_parser.h index 10c70357da..0db2aa7ba1 100644 --- a/core/fpdfapi/parser/cpdf_parser.h +++ b/core/fpdfapi/parser/cpdf_parser.h @@ -13,8 +13,10 @@ #include #include +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" +#include "core/fxcrt/fx_system.h" class CPDF_Array; class CPDF_CryptoHandler; diff --git a/core/fpdfapi/parser/cpdf_read_validator.h b/core/fpdfapi/parser/cpdf_read_validator.h index 20ec866a59..cc04a1f55e 100644 --- a/core/fpdfapi/parser/cpdf_read_validator.h +++ b/core/fpdfapi/parser/cpdf_read_validator.h @@ -6,6 +6,7 @@ #define CORE_FPDFAPI_PARSER_CPDF_READ_VALIDATOR_H_ #include "core/fpdfapi/parser/cpdf_data_avail.h" +#include "core/fxcrt/fx_stream.h" class CPDF_ReadValidator : public IFX_SeekableReadStream { public: diff --git a/core/fpdfapi/parser/cpdf_reference.cpp b/core/fpdfapi/parser/cpdf_reference.cpp index 4594fe9f44..ce4c308d8c 100644 --- a/core/fpdfapi/parser/cpdf_reference.cpp +++ b/core/fpdfapi/parser/cpdf_reference.cpp @@ -7,6 +7,7 @@ #include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp b/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp index f1c84853dc..bdb532d3e0 100644 --- a/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_simple_parser_unittest.cpp @@ -7,7 +7,6 @@ #include #include "core/fpdfapi/parser/fpdf_parser_utility.h" -#include "core/fxcrt/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/core/fpdfapi/parser/cpdf_stream.cpp b/core/fpdfapi/parser/cpdf_stream.cpp index d430a4fb45..1c8660efb0 100644 --- a/core/fpdfapi/parser/cpdf_stream.cpp +++ b/core/fpdfapi/parser/cpdf_stream.cpp @@ -12,6 +12,7 @@ #include "core/fpdfapi/parser/cpdf_number.h" #include "core/fpdfapi/parser/cpdf_stream_acc.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/numerics/safe_conversions.h" #include "third_party/base/ptr_util.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/parser/cpdf_stream.h b/core/fpdfapi/parser/cpdf_stream.h index 2795f7daae..1dbbd0343e 100644 --- a/core/fpdfapi/parser/cpdf_stream.h +++ b/core/fpdfapi/parser/cpdf_stream.h @@ -13,7 +13,7 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_object.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_stream.h" class CPDF_Stream : public CPDF_Object { public: diff --git a/core/fpdfapi/parser/cpdf_string.cpp b/core/fpdfapi/parser/cpdf_string.cpp index 74a2733fc5..6ce6bf3473 100644 --- a/core/fpdfapi/parser/cpdf_string.cpp +++ b/core/fpdfapi/parser/cpdf_string.cpp @@ -9,6 +9,7 @@ #include #include "core/fpdfapi/parser/fpdf_parser_decode.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/ptr_util.h" CPDF_String::CPDF_String() : m_bHex(false) {} diff --git a/core/fpdfapi/parser/cpdf_syntax_parser.h b/core/fpdfapi/parser/cpdf_syntax_parser.h index 25c7403961..c95188acbe 100644 --- a/core/fpdfapi/parser/cpdf_syntax_parser.h +++ b/core/fpdfapi/parser/cpdf_syntax_parser.h @@ -12,7 +12,6 @@ #include "core/fxcrt/cfx_string_pool_template.h" #include "core/fxcrt/cfx_weak_ptr.h" -#include "core/fxcrt/fx_basic.h" class CPDF_CryptoHandler; class CPDF_Dictionary; diff --git a/core/fpdfapi/parser/fpdf_parser_decode.h b/core/fpdfapi/parser/fpdf_parser_decode.h index 4d2c6732e0..23ca0a0fae 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode.h +++ b/core/fpdfapi/parser/fpdf_parser_decode.h @@ -9,7 +9,7 @@ #include -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" class CCodec_ScanlineDecoder; class CPDF_Dictionary; diff --git a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp index 799da49bdc..502e4666f7 100644 --- a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp @@ -7,7 +7,6 @@ #include #include -#include "core/fxcrt/fx_basic.h" #include "testing/embedder_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/core/fpdfapi/parser/fpdf_parser_utility.cpp b/core/fpdfapi/parser/fpdf_parser_utility.cpp index a36d640da3..c6487f55a0 100644 --- a/core/fpdfapi/parser/fpdf_parser_utility.cpp +++ b/core/fpdfapi/parser/fpdf_parser_utility.cpp @@ -16,6 +16,7 @@ #include "core/fpdfapi/parser/cpdf_string.h" #include "core/fpdfapi/parser/fpdf_parser_decode.h" #include "core/fxcrt/fx_extension.h" +#include "core/fxcrt/fx_stream.h" #include "third_party/base/logging.h" // Indexed by 8-bit character code, contains either: diff --git a/core/fpdfapi/parser/fpdf_parser_utility.h b/core/fpdfapi/parser/fpdf_parser_utility.h index 47431e47dd..94ee1fcfd3 100644 --- a/core/fpdfapi/parser/fpdf_parser_utility.h +++ b/core/fpdfapi/parser/fpdf_parser_utility.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_PARSER_FPDF_PARSER_UTILITY_H_ #include "core/fxcrt/cfx_retain_ptr.h" -#include "core/fxcrt/fx_basic.h" +#include "core/fxcrt/fx_string.h" class IFX_SeekableReadStream; class CPDF_Dictionary; diff --git a/core/fpdfapi/render/cpdf_imageloader.cpp b/core/fpdfapi/render/cpdf_imageloader.cpp index 60e64449bf..f195b89dfc 100644 --- a/core/fpdfapi/render/cpdf_imageloader.cpp +++ b/core/fpdfapi/render/cpdf_imageloader.cpp @@ -12,7 +12,6 @@ #include "core/fpdfapi/render/cpdf_imagecacheentry.h" #include "core/fpdfapi/render/cpdf_pagerendercache.h" #include "core/fpdfapi/render/cpdf_renderstatus.h" -#include "core/fxcrt/fx_basic.h" CPDF_ImageLoader::CPDF_ImageLoader() : m_MatteColor(0), diff --git a/core/fpdfapi/render/cpdf_imageloader.h b/core/fpdfapi/render/cpdf_imageloader.h index e96fe37ca1..69577c3a18 100644 --- a/core/fpdfapi/render/cpdf_imageloader.h +++ b/core/fpdfapi/render/cpdf_imageloader.h @@ -9,8 +9,8 @@ #include +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxge/fx_dib.h" class CPDF_ImageObject; diff --git a/core/fpdfapi/render/cpdf_rendercontext.h b/core/fpdfapi/render/cpdf_rendercontext.h index 220ff2b775..feb71871b1 100644 --- a/core/fpdfapi/render/cpdf_rendercontext.h +++ b/core/fpdfapi/render/cpdf_rendercontext.h @@ -9,8 +9,8 @@ #include +#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/cfx_unowned_ptr.h" -#include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" class CPDF_Dictionary; -- cgit v1.2.3