Cleanup forward declarations.

This CL removes duplicate forward declarations, removes extraneous declarations
and adds a couple of missing declarations.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1741003002 .

13 files changed, 1 insertions, 30 deletions

diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index dffef9606e..e8cbb0d201 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -13,27 +13,19 @@
 #include "core/include/fxcrt/fx_system.h"
 
 class CCodec_ModuleMgr;
-class CFX_BitmapDevice;
-class CFX_DIBSource;
-class CFX_Matrix;
 class CPDF_ColorSpace;
-class CPDF_Dictionary;
 class CPDF_DocPageData;
 class CPDF_DocRenderData;
 class CPDF_Document;
 class CPDF_FontGlobals;
-class CPDF_Image;
 class CPDF_Page;
 class CPDF_PageRenderCache;
-class CPDF_RenderOptions;
-class CPDF_Stream;
 class ICodec_FaxModule;
 class ICodec_FlateModule;
 class ICodec_IccModule;
 class ICodec_Jbig2Module;
 class ICodec_JpegModule;
 class ICodec_JpxModule;
-class IPDF_FontMapper;
 class IPDF_PageModule;
 class IPDF_RenderModule;
 
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index 5791b7e6b3..238f57de59 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -15,9 +15,7 @@
 
 class CPDF_Array;
 class CPDF_Boolean;
-class CPDF_CryptoHandler;
 class CPDF_Dictionary;
-class CPDF_Document;
 class CPDF_IndirectObjectHolder;
 class CPDF_Name;
 class CPDF_Null;
@@ -26,7 +24,6 @@ class CPDF_Parser;
 class CPDF_Reference;
 class CPDF_Stream;
 class CPDF_StreamAcc;
-class CPDF_StreamFilter;
 class CPDF_String;
 class IFX_FileRead;
 
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 973a28030f..4c880525f1 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -19,10 +19,9 @@ class CPDF_Form;
 class CPDF_ParseOptions;
 class CPDF_PageObject;
 class CPDF_PageRenderCache;
-class CPDF_StreamFilter;
 class CPDF_AllStates;
 class CPDF_ContentParser;
-class CPDF_StreamContentParser;
+class CPDF_ImageObject;
 
 #define PDFTRANS_GROUP 0x0100
 #define PDFTRANS_ISOLATED 0x0200
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index cc9b9413ea..298e5e2fc7 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -16,13 +16,8 @@
 class CFX_GraphStateData;
 class CFX_PathData;
 class CFX_RenderDevice;
-class CPDF_FormObject;
 class CPDF_ImageCacheEntry;
-class CPDF_ImageObject;
-class CPDF_PathObject;
 class CPDF_RenderStatus;
-class CPDF_ShadingObject;
-class CPDF_TextObject;
 class IFX_Pause;
 
 class IPDF_OCContext {
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 7dbc3fd618..393a9cc0bf 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -22,12 +22,10 @@ class CPDF_CIDFont;
 class CPDF_CMap;
 class CPDF_Color;
 class CPDF_ColorSpace;
-class CPDF_Face;
 class CPDF_FontEncoding;
 class CPDF_Form;
 class CPDF_Function;
 class CPDF_Image;
-class CPDF_ImageObject;
 class CPDF_Page;
 class CPDF_Pattern;
 class CPDF_RenderContext;
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index 5f493c4365..ccbea36404 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -10,7 +10,6 @@
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 
-class CPDF_ObjectStream;
 class CPDF_XRefStream;
 
 CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& buf, const CPDF_Object* pObj);
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 15616be4d5..e1766e0c38 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -34,11 +34,9 @@ class CPDF_IconFit;
 class CPDF_InterForm;
 class CPDF_Link;
 class CPDF_Metadata;
-class CPDF_NumberTree;
 class CPDF_OCContext;
 class CPDF_Page;
 class CPDF_RenderOptions;
-class CPDF_TextObject;
 class CPDF_ViewerPreferences;
 class CXML_Element;
 
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index 45277fb434..82ac64db9e 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -8,10 +8,8 @@
 #define CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
 
 class CPDF_Document;
-class CPDF_Page;
 class CPDF_StructElement;
 class CPDF_StructTree;
-class IPDF_ReflowedPage;
 struct CPDF_StructKid;
 
 class CPDF_StructTree {
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index c1842626f0..5c289c1a48 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -18,7 +18,6 @@
 class CFX_DIBSource;
 class CJPX_Decoder;
 class CPDF_ColorSpace;
-class CPDF_PrivateData;
 class CPDF_StreamAcc;
 class ICodec_BasicModule;
 class ICodec_FaxModule;
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 29a4304129..67ca1a7f4e 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -24,7 +24,6 @@ class CFX_PathData;
 class CFX_SizeGlyphCache;
 class CFX_SubstFont;
 class CTTFontDesc;
-class IFX_FontEncoding;
 class IFX_SystemFontInfo;
 
 #define FXFONT_FIXED_PITCH 0x01
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index ef742a38be..dd30148094 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -15,7 +15,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 
 class CFX_BidiChar;
-class CPDF_DocProgressiveSearch;
 class CPDF_FormObject;
 class CPDF_LinkExtract;
 class CPDF_TextPageFind;
diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h b/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
index 42b4eb66d9..5d8eabb164 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
@@ -11,7 +11,6 @@
 
 class CJBig2_ArithDecoder;
 class CJBig2_Image;
-class IFX_Pause;
 struct JBig2ArithCtx;
 
 class CJBig2_GRRDProc {
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index c88f2407c1..12d5fa520b 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -13,7 +13,6 @@
 
 class CFPF_SkiaFontDescriptor;
 class CFPF_SkiaFontMgr;
-class SkTypeface;
 class CFPF_SkiaFont : public IFPF_Font {
  public:
   CFPF_SkiaFont();