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/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 - 9 files changed, 4 insertions(+), 6 deletions(-) (limited to 'core/fpdfapi/page') 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; -- cgit v1.2.3