From cac704dd3e5c0e5900e898db4eff5a0948cef6fc Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 28 Jul 2016 12:59:09 -0700 Subject: Split fpdfdoc/include/fpdf_doc.h into individual classes. This CL splits the header file apart. The cpp files are not touched as part of this CL, they will be done as a followup. This de-duplicates the fpdf_doc.h BUG=pdfium:249 Review-Url: https://codereview.chromium.org/2183313004 --- fpdfsdk/include/fsdk_actionhandler.h | 1 - fpdfsdk/include/fsdk_baseannot.h | 5 +++-- fpdfsdk/include/fsdk_baseform.h | 4 +++- fpdfsdk/include/fsdk_define.h | 5 ++++- fpdfsdk/include/fsdk_mgr.h | 2 ++ 5 files changed, 12 insertions(+), 5 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index 45ff5571a5..e8f1a0deb9 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -10,7 +10,6 @@ #include #include -#include "core/fpdfdoc/include/fpdf_doc.h" #include "core/fxcrt/include/fx_string.h" #include "fpdfsdk/include/fsdk_baseform.h" diff --git a/fpdfsdk/include/fsdk_baseannot.h b/fpdfsdk/include/fsdk_baseannot.h index 95d49ae272..a4f72ab28b 100644 --- a/fpdfsdk/include/fsdk_baseannot.h +++ b/fpdfsdk/include/fsdk_baseannot.h @@ -13,14 +13,15 @@ #include #endif -#include "core/fpdfdoc/include/fpdf_doc.h" +#include "core/fpdfdoc/include/cpdf_aaction.h" +#include "core/fpdfdoc/include/cpdf_annot.h" +#include "core/fpdfdoc/include/cpdf_defaultappearance.h" #include "core/fxcrt/include/fx_basic.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/fsdk_common.h" #include "fpdfsdk/include/fsdk_define.h" class CPDFSDK_PageView; -class CPDF_Annot; class CPDF_Page; class CFX_Matrix; class CPDF_RenderOptions; diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index f6df689984..91603aa41f 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -10,7 +10,7 @@ #include #include -#include "core/fpdfdoc/include/fpdf_doc.h" +#include "core/fpdfdoc/include/ipdf_formnotify.h" #include "core/fxcrt/include/fx_basic.h" #include "core/fxge/include/fx_dib.h" #include "fpdfsdk/include/fsdk_baseannot.h" @@ -26,7 +26,9 @@ class CPDFSDK_Document; class CPDFSDK_InterForm; class CPDFSDK_PageView; class CPDF_Action; +class CPDF_FormControl; class CPDF_FormField; +class CPDF_InterForm; struct CPWL_Color; #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index fe221c9d7d..909cbbd9d2 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -8,7 +8,7 @@ #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" -#include "core/fpdfdoc/include/fpdf_doc.h" +#include "core/fxge/include/fx_dib.h" #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA @@ -31,6 +31,9 @@ ((uint32_t)rgb & 0x0000FF00) | (((uint32_t)rgb & 0x00FF0000) >> 16)) typedef unsigned int FX_UINT; + +class CPDF_Annot; +class CPDF_Page; class CPDF_PageRenderContext; class IFSDK_PAUSE_Adapter; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 16aef4af4e..b87c982cc1 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -13,6 +13,7 @@ #include "core/fpdfapi/fpdf_page/include/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" +#include "core/fpdfdoc/include/cpdf_occontext.h" #include "fpdfsdk/cfx_systemhandler.h" #include "fpdfsdk/include/fsdk_actionhandler.h" #include "fpdfsdk/include/fsdk_annothandler.h" @@ -25,6 +26,7 @@ class CFFL_IFormFiller; class CFX_SystemHandler; +class CPDF_AnnotList; class CPDFSDK_ActionHandler; class CPDFSDK_Annot; class CPDFSDK_InterForm; -- cgit v1.2.3