3 files changed, 24 insertions, 57 deletions

diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index 6317cd0b18..5be2b192c4 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -9,20 +9,38 @@
 
 #include "../fxcrt/fx_ext.h"
 
+class CCodec_ModuleMgr;
+class CFX_AffineMatrix;
+class CFX_BitmapDevice;
+class CFX_DIBSource;
+class CPDF_ColorSpace;
+class CPDF_Dictionary;
+class CPDF_DocPageData;
+class CPDF_DocRenderData;
+class CPDF_Document;
+class CPDF_FontGlobals;
+class CPDF_Image;
 class CPDF_ModuleMgr;
+class CPDF_Page;
 class CPDF_PageModuleDef;
+class CPDF_PageObjects;
+class CPDF_PageRenderCache;
+class CPDF_RenderConfig;
 class CPDF_RenderModuleDef;
+class CPDF_RenderOptions;
 class CPDF_SecurityHandler;
-class CCodec_ModuleMgr;
-class CPDF_Dictionary;
-class ICodec_JpegModule;
-class ICodec_JpxModule;
+class CPDF_Stream;
 class ICodec_FaxModule;
-class ICodec_Jbig2Module;
-class ICodec_IccModule;
 class ICodec_FlateModule;
+class ICodec_IccModule;
+class ICodec_Jbig2Module;
+class ICodec_JpegModule;
+class ICodec_JpxModule;
+class IPDF_FontMapper;
+
 #define ADDIN_NAME_CJK			"Eastern Asian Language Support"
 #define ADDIN_NAME_DECODER		"JPEG2000 and JBIG2 Image Decoders"
+
 class CPDF_ModuleMgr 
 {
 public:
@@ -117,12 +135,6 @@ protected:
 
     CFX_PrivateData			m_privateData;
 };
-class CPDF_Document;
-class CPDF_DocPageData;
-class CPDF_FontGlobals;
-class IPDF_FontMgr;
-class IPDF_FontMapper;
-class CPDF_ColorSpace;
 class CPDF_PageModuleDef 
 {
 public:
@@ -150,17 +162,6 @@ public:
         return NULL;
     }
 };
-class CPDF_PageObjects;
-class CFX_AffineMatrix;
-class CPDF_RenderOptions;
-class CPDF_Page;
-class CPDF_DocRenderData;
-class CPDF_PageRenderCache;
-class CFX_BitmapDevice;
-class CPDF_Stream;
-class CFX_DIBSource;
-class CPDF_RenderConfig;
-class CPDF_Image;
 class CPDF_RenderModuleDef 
 {
 public:
diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h
index 34568e79ca..d18d362ec0 100644
--- a/core/include/fpdfapi/fpdf_parser.h
+++ b/core/include/fpdfapi/fpdf_parser.h
@@ -51,12 +51,6 @@ class CFX_PrivateData;
 //   'R' - otherwise.
 extern const char PDF_CharType[256];
 
-class IPDF_EnumPageHandler
-{
-public:
-    virtual ~IPDF_EnumPageHandler() { }
-    virtual FX_BOOL EnumPage(CPDF_Dictionary* pPageDict) = 0;
-};
 class CPDF_Document : public CFX_PrivateData, public CPDF_IndirectObjects
 {
 public:
@@ -92,8 +86,6 @@ public:
 
     int						GetPageIndex(FX_DWORD objnum);
 
-    void					EnumPages(IPDF_EnumPageHandler* pHandler);
-
     FX_DWORD				GetUserPermissions(FX_BOOL bCheckRevision = FALSE) const;
 
     FX_BOOL					IsOwner() const;
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index 714fffba5c..47d1b19920 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -96,8 +96,6 @@ public:
 
     void			AppendObjectList(CPDF_PageObjects* pObjs, const CFX_AffineMatrix* pObject2Device);
 
-    void			SetBackground(class IPDF_BackgroundDraw* pBackground);
-
     void			Render(CFX_RenderDevice* pDevice, const CPDF_RenderOptions* pOptions = NULL,
                            const CFX_AffineMatrix* pFinalMatrix = NULL);
 
@@ -124,8 +122,6 @@ protected:
 
     CFX_ArrayTemplate<struct _PDF_RenderItem>	m_ContentList;
 
-    IPDF_BackgroundDraw*	m_pBackgroundDraw;
-
     FX_BOOL					m_bFirstLayer;
 
     void			Render(CFX_RenderDevice* pDevice, const CPDF_PageObject* pStopObj,
@@ -133,15 +129,6 @@ protected:
     friend class CPDF_RenderStatus;
     friend class CPDF_ProgressiveRenderer;
 };
-class IPDF_BackgroundDraw
-{
-public:
-    virtual ~IPDF_BackgroundDraw() { }
-    virtual	void	OnDrawBackground(
-        CFX_RenderDevice* pBitmapDevice,
-        const CFX_AffineMatrix* pOriginal2Bitmap
-    ) = 0;
-};
 class CPDF_ProgressiveRenderer 
 {
 public:
@@ -234,19 +221,6 @@ public:
                                   CPDF_Font* pFont, FX_FLOAT font_size, const CFX_AffineMatrix* pText2Device,
                                   FX_ARGB fill_argb);
 };
-class IPDF_PageImageCache
-{
-public:
-
-    static IPDF_PageImageCache* Create();
-
-    virtual ~IPDF_PageImageCache() {}
-
-    virtual void		OutputPage(CFX_RenderDevice* pDevice, CPDF_Page* pPage,
-                                   int pos_x, int pos_y, int size_x, int size_y, int rotate) = 0;
-
-    virtual void		SetCacheLimit(FX_DWORD limit) = 0;
-};
 class CPDF_PageRenderCache 
 {
 public: