From 39c62fd528854eb4606b8f1917a777532b04db03 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 29 Sep 2016 12:49:17 -0700 Subject: Move core/fpdfapi/include to core/fpdfapi BUG=pdfium:611 Review-Url: https://codereview.chromium.org/2376153004 --- BUILD.gn | 4 +- core/fpdfapi/cpdf_modulemgr.cpp | 2 +- core/fpdfapi/cpdf_modulemgr.h | 76 ++++++++++++++++++++++ core/fpdfapi/cpdf_pagerendercontext.cpp | 2 +- core/fpdfapi/cpdf_pagerendercontext.h | 31 +++++++++ core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp | 2 +- core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp | 2 +- core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp | 2 +- core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp | 2 +- core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_cidfont.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_font.cpp | 2 +- core/fpdfapi/fpdf_font/fpdf_font.cpp | 2 +- core/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 2 +- core/fpdfapi/fpdf_page/cpdf_colorspace.cpp | 2 +- core/fpdfapi/fpdf_page/cpdf_image.cpp | 2 +- core/fpdfapi/fpdf_page/cpdf_page.cpp | 2 +- core/fpdfapi/fpdf_page/fpdf_page_colors.cpp | 2 +- core/fpdfapi/fpdf_page/fpdf_page_doc.cpp | 2 +- core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 2 +- core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp | 2 +- core/fpdfapi/fpdf_parser/cpdf_document.cpp | 2 +- core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp | 2 +- core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | 2 +- core/fpdfapi/fpdf_render/fpdf_render.cpp | 2 +- core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 2 +- core/fpdfapi/include/cpdf_modulemgr.h | 76 ---------------------- core/fpdfapi/include/cpdf_pagerendercontext.h | 31 --------- fpdfsdk/DEPS | 2 +- fpdfsdk/fpdf_ext.cpp | 2 +- fpdfsdk/fpdf_progressive.cpp | 2 +- fpdfsdk/fpdfdoc_unittest.cpp | 2 +- fpdfsdk/fpdfeditimg.cpp | 2 +- fpdfsdk/fpdfeditimg_unittest.cpp | 2 +- fpdfsdk/fpdfview.cpp | 4 +- fpdfsdk/pdfwindow/PWL_FontMap.cpp | 2 +- 36 files changed, 141 insertions(+), 141 deletions(-) create mode 100644 core/fpdfapi/cpdf_modulemgr.h create mode 100644 core/fpdfapi/cpdf_pagerendercontext.h delete mode 100644 core/fpdfapi/include/cpdf_modulemgr.h delete mode 100644 core/fpdfapi/include/cpdf_pagerendercontext.h diff --git a/BUILD.gn b/BUILD.gn index 3d2d32bf1b..83f68fbe7c 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -328,7 +328,9 @@ static_library("fpdfdoc") { static_library("fpdfapi") { sources = [ "core/fpdfapi/cpdf_modulemgr.cpp", + "core/fpdfapi/cpdf_modulemgr.h", "core/fpdfapi/cpdf_pagerendercontext.cpp", + "core/fpdfapi/cpdf_pagerendercontext.h", "core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp", "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp", "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp", @@ -541,8 +543,6 @@ static_library("fpdfapi") { "core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp", "core/fpdfapi/fpdf_render/fpdf_render_text.cpp", "core/fpdfapi/fpdf_render/render_int.h", - "core/fpdfapi/include/cpdf_modulemgr.h", - "core/fpdfapi/include/cpdf_pagerendercontext.h", ] configs += [ ":pdfium_core_config" ] deps = [ diff --git a/core/fpdfapi/cpdf_modulemgr.cpp b/core/fpdfapi/cpdf_modulemgr.cpp index 454ffcd465..26a0ff37e6 100644 --- a/core/fpdfapi/cpdf_modulemgr.cpp +++ b/core/fpdfapi/cpdf_modulemgr.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" #include "core/fxcodec/include/fx_codec.h" diff --git a/core/fpdfapi/cpdf_modulemgr.h b/core/fpdfapi/cpdf_modulemgr.h new file mode 100644 index 0000000000..cd7561a1f9 --- /dev/null +++ b/core/fpdfapi/cpdf_modulemgr.h @@ -0,0 +1,76 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef CORE_FPDFAPI_CPDF_MODULEMGR_H_ +#define CORE_FPDFAPI_CPDF_MODULEMGR_H_ + +#include + +#include "core/fxcrt/include/fx_basic.h" + +class CCodec_FaxModule; +class CCodec_FlateModule; +class CCodec_IccModule; +class CCodec_Jbig2Module; +class CCodec_JpegModule; +class CCodec_JpxModule; +class CCodec_ModuleMgr; +class CPDF_PageModule; + +class CFSDK_UnsupportInfo_Adapter { + public: + explicit CFSDK_UnsupportInfo_Adapter(void* unsp_info) + : m_unsp_info(unsp_info) {} + + void* GetUnspInfo() const { return m_unsp_info; } + + private: + void* const m_unsp_info; +}; + +class CPDF_ModuleMgr { + public: + static CPDF_ModuleMgr* Get(); + static void Create(); + static void Destroy(); + static const int kFileBufSize = 512; + + void SetCodecModule(CCodec_ModuleMgr* pModule) { m_pCodecModule = pModule; } + CCodec_ModuleMgr* GetCodecModule() { return m_pCodecModule; } + + void InitPageModule(); + CPDF_PageModule* GetPageModule() const { return m_pPageModule.get(); } + + void SetUnsupportInfoAdapter( + std::unique_ptr pAdapter) { + m_pUnsupportInfoAdapter = std::move(pAdapter); + } + CFSDK_UnsupportInfo_Adapter* GetUnsupportInfoAdapter() const { + return m_pUnsupportInfoAdapter.get(); + } + + void LoadEmbeddedGB1CMaps(); + void LoadEmbeddedCNS1CMaps(); + void LoadEmbeddedJapan1CMaps(); + void LoadEmbeddedKorea1CMaps(); + + CCodec_FaxModule* GetFaxModule(); + CCodec_JpegModule* GetJpegModule(); + CCodec_JpxModule* GetJpxModule(); + CCodec_Jbig2Module* GetJbig2Module(); + CCodec_IccModule* GetIccModule(); + CCodec_FlateModule* GetFlateModule(); + + private: + CPDF_ModuleMgr(); + ~CPDF_ModuleMgr(); + + CCodec_ModuleMgr* m_pCodecModule; + std::unique_ptr m_pPageModule; + std::unique_ptr m_pUnsupportInfoAdapter; +}; + +#endif // CORE_FPDFAPI_CPDF_MODULEMGR_H_ diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp index c524c3b9bb..6a1918176c 100644 --- a/core/fpdfapi/cpdf_pagerendercontext.cpp +++ b/core/fpdfapi/cpdf_pagerendercontext.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "core/fpdfapi/include/cpdf_pagerendercontext.h" +#include "core/fpdfapi/cpdf_pagerendercontext.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h" diff --git a/core/fpdfapi/cpdf_pagerendercontext.h b/core/fpdfapi/cpdf_pagerendercontext.h new file mode 100644 index 0000000000..9ddd075778 --- /dev/null +++ b/core/fpdfapi/cpdf_pagerendercontext.h @@ -0,0 +1,31 @@ +// Copyright 2016 PDFium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com + +#ifndef CORE_FPDFAPI_CPDF_PAGERENDERCONTEXT_H_ +#define CORE_FPDFAPI_CPDF_PAGERENDERCONTEXT_H_ + +#include + +class CFX_RenderDevice; +class CPDF_AnnotList; +class CPDF_ProgressiveRenderer; +class CPDF_RenderContext; +class CPDF_RenderOptions; + +// Everything about rendering is put here: for OOM recovery +class CPDF_PageRenderContext { + public: + CPDF_PageRenderContext(); + ~CPDF_PageRenderContext(); + + std::unique_ptr m_pDevice; + std::unique_ptr m_pContext; + std::unique_ptr m_pRenderer; + std::unique_ptr m_pAnnots; + std::unique_ptr m_pOptions; +}; + +#endif // CORE_FPDFAPI_CPDF_PAGERENDERCONTEXT_H_ diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp index 2da1197787..59827d79d4 100644 --- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp +++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp @@ -6,10 +6,10 @@ #include "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { diff --git a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp index 35e4894382..61d13933e6 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp @@ -6,10 +6,10 @@ #include "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = { diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp index 595989be3c..f2d4978413 100644 --- a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp +++ b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp @@ -6,10 +6,10 @@ #include "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp index 1649bf429f..143963fd4e 100644 --- a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp +++ b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp @@ -6,10 +6,10 @@ #include "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_basic.h" static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = { diff --git a/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp index caf234badb..2af78102ba 100644 --- a/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp +++ b/core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp @@ -6,9 +6,9 @@ #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" extern "C" { diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp index 9b786040f4..ce7d5090d5 100644 --- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp @@ -9,6 +9,7 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h" #include "core/fpdfapi/fpdf_font/font_int.h" @@ -17,7 +18,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "third_party/base/numerics/safe_math.h" namespace { diff --git a/core/fpdfapi/fpdf_font/cpdf_font.cpp b/core/fpdfapi/fpdf_font/cpdf_font.cpp index 017cc98c15..e431d3d31b 100644 --- a/core/fpdfapi/fpdf_font/cpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_font.cpp @@ -9,6 +9,7 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h" #include "core/fpdfapi/fpdf_font/cpdf_truetypefont.h" #include "core/fpdfapi/fpdf_font/cpdf_type1font.h" @@ -21,7 +22,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_name.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/include/fx_freetype.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp index 5c042dadc4..5302ba75b8 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp @@ -6,6 +6,7 @@ #include "core/fpdfapi/fpdf_font/font_int.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_form.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" #include "core/fpdfapi/fpdf_page/pageint.h" @@ -16,7 +17,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxge/include/fx_freetype.h" #include "third_party/base/numerics/safe_conversions.h" diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 184f9f0a7c..dcb8593591 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -6,13 +6,13 @@ #include "core/fpdfapi/fpdf_font/font_int.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/ttgsubtable.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxge/include/fx_freetype.h" diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp index 61a37f564c..53e0807841 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp @@ -8,6 +8,7 @@ #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" #include "core/fpdfapi/fpdf_page/pageint.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" @@ -17,7 +18,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/fx_codec.h" namespace { diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp index ecd3399c7b..750dbd1a50 100644 --- a/core/fpdfapi/fpdf_page/cpdf_image.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp @@ -10,6 +10,7 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_page/pageint.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" @@ -18,7 +19,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" #include "core/fpdfapi/fpdf_render/render_int.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxge/include/fx_dib.h" diff --git a/core/fpdfapi/fpdf_page/cpdf_page.cpp b/core/fpdfapi/fpdf_page/cpdf_page.cpp index 4dbfb019a6..7c4b2bb203 100644 --- a/core/fpdfapi/fpdf_page/cpdf_page.cpp +++ b/core/fpdfapi/fpdf_page/cpdf_page.cpp @@ -8,13 +8,13 @@ #include +#include "core/fpdfapi/cpdf_pagerendercontext.h" #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" #include "core/fpdfapi/fpdf_page/pageint.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_object.h" #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" -#include "core/fpdfapi/include/cpdf_pagerendercontext.h" #include "third_party/base/stl_util.h" CPDF_Page::CPDF_Page(CPDF_Document* pDocument, diff --git a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 1f643f0b4f..f900640a63 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -10,13 +10,13 @@ #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/fx_codec.h" namespace { diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp index 5d7b88a152..82cb405859 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp @@ -10,6 +10,7 @@ #include #include "core/fdrm/crypto/fx_crypt.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/cpdf_type1font.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/fpdf_page/cpdf_image.h" @@ -21,7 +22,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "third_party/base/stl_util.h" void CPDF_ModuleMgr::InitPageModule() { diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 9f5b4debdf..5a25c308fd 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -8,6 +8,7 @@ #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/cpdf_type3char.h" #include "core/fpdfapi/fpdf_page/cpdf_allstates.h" #include "core/fpdfapi/fpdf_page/cpdf_form.h" @@ -26,7 +27,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxcrt/include/fx_safe_types.h" diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp index d29eb4afa5..c6414a6b1f 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp @@ -10,6 +10,7 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" @@ -19,7 +20,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_ext.h" #include "core/fxcrt/include/fx_safe_types.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp index 9d2ecc4175..cf8bed67ef 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp @@ -10,6 +10,7 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h" #include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h" #include "core/fpdfapi/fpdf_page/pageint.h" @@ -19,7 +20,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_stream.h" #include "core/fpdfapi/fpdf_render/render_int.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/JBig2_DocumentContext.h" #include "core/fxge/include/cfx_unicodeencoding.h" #include "core/fxge/include/fx_font.h" diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp index 3238648f25..5aa431ad59 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp @@ -8,6 +8,7 @@ #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h" #include "core/fpdfapi/fpdf_parser/cpdf_crypto_handler.h" @@ -20,7 +21,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcrt/include/fx_ext.h" #include "third_party/base/numerics/safe_math.h" diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index 833f8831d6..9af8a9292e 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -12,10 +12,10 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_ext.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp index 5bd2df8cc3..19bfc1c3d0 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp @@ -8,6 +8,7 @@ #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/cpdf_type3char.h" #include "core/fpdfapi/fpdf_font/cpdf_type3font.h" #include "core/fpdfapi/fpdf_page/cpdf_form.h" @@ -28,7 +29,6 @@ #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fpdfdoc/include/cpdf_occontext.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_graphstatedata.h" diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 253613f601..aa590dfc33 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -10,6 +10,7 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_image.h" #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h" #include "core/fpdfapi/fpdf_page/pageint.h" @@ -17,7 +18,6 @@ #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fxcodec/include/fx_codec.h" #include "core/fxcrt/include/fx_safe_types.h" diff --git a/core/fpdfapi/include/cpdf_modulemgr.h b/core/fpdfapi/include/cpdf_modulemgr.h deleted file mode 100644 index 6e00385480..0000000000 --- a/core/fpdfapi/include/cpdf_modulemgr.h +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef CORE_FPDFAPI_INCLUDE_CPDF_MODULEMGR_H_ -#define CORE_FPDFAPI_INCLUDE_CPDF_MODULEMGR_H_ - -#include - -#include "core/fxcrt/include/fx_basic.h" - -class CCodec_FaxModule; -class CCodec_FlateModule; -class CCodec_IccModule; -class CCodec_Jbig2Module; -class CCodec_JpegModule; -class CCodec_JpxModule; -class CCodec_ModuleMgr; -class CPDF_PageModule; - -class CFSDK_UnsupportInfo_Adapter { - public: - explicit CFSDK_UnsupportInfo_Adapter(void* unsp_info) - : m_unsp_info(unsp_info) {} - - void* GetUnspInfo() const { return m_unsp_info; } - - private: - void* const m_unsp_info; -}; - -class CPDF_ModuleMgr { - public: - static CPDF_ModuleMgr* Get(); - static void Create(); - static void Destroy(); - static const int kFileBufSize = 512; - - void SetCodecModule(CCodec_ModuleMgr* pModule) { m_pCodecModule = pModule; } - CCodec_ModuleMgr* GetCodecModule() { return m_pCodecModule; } - - void InitPageModule(); - CPDF_PageModule* GetPageModule() const { return m_pPageModule.get(); } - - void SetUnsupportInfoAdapter( - std::unique_ptr pAdapter) { - m_pUnsupportInfoAdapter = std::move(pAdapter); - } - CFSDK_UnsupportInfo_Adapter* GetUnsupportInfoAdapter() const { - return m_pUnsupportInfoAdapter.get(); - } - - void LoadEmbeddedGB1CMaps(); - void LoadEmbeddedCNS1CMaps(); - void LoadEmbeddedJapan1CMaps(); - void LoadEmbeddedKorea1CMaps(); - - CCodec_FaxModule* GetFaxModule(); - CCodec_JpegModule* GetJpegModule(); - CCodec_JpxModule* GetJpxModule(); - CCodec_Jbig2Module* GetJbig2Module(); - CCodec_IccModule* GetIccModule(); - CCodec_FlateModule* GetFlateModule(); - - private: - CPDF_ModuleMgr(); - ~CPDF_ModuleMgr(); - - CCodec_ModuleMgr* m_pCodecModule; - std::unique_ptr m_pPageModule; - std::unique_ptr m_pUnsupportInfoAdapter; -}; - -#endif // CORE_FPDFAPI_INCLUDE_CPDF_MODULEMGR_H_ diff --git a/core/fpdfapi/include/cpdf_pagerendercontext.h b/core/fpdfapi/include/cpdf_pagerendercontext.h deleted file mode 100644 index 2ee3daeda3..0000000000 --- a/core/fpdfapi/include/cpdf_pagerendercontext.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef CORE_FPDFAPI_INCLUDE_CPDF_PAGERENDERCONTEXT_H_ -#define CORE_FPDFAPI_INCLUDE_CPDF_PAGERENDERCONTEXT_H_ - -#include - -class CFX_RenderDevice; -class CPDF_AnnotList; -class CPDF_ProgressiveRenderer; -class CPDF_RenderContext; -class CPDF_RenderOptions; - -// Everything about rendering is put here: for OOM recovery -class CPDF_PageRenderContext { - public: - CPDF_PageRenderContext(); - ~CPDF_PageRenderContext(); - - std::unique_ptr m_pDevice; - std::unique_ptr m_pContext; - std::unique_ptr m_pRenderer; - std::unique_ptr m_pAnnots; - std::unique_ptr m_pOptions; -}; - -#endif // CORE_FPDFAPI_INCLUDE_CPDF_PAGERENDERCONTEXT_H_ diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS index accd53e722..f5e84768ff 100644 --- a/fpdfsdk/DEPS +++ b/fpdfsdk/DEPS @@ -1,6 +1,6 @@ include_rules = [ '+core/fpdftext/include', - '+core/fpdfapi/include', + '+core/fpdfapi', '+core/fpdfapi/fpdf_edit', '+core/fpdfapi/fpdf_page', '+core/fpdfapi/fpdf_parser', diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp index 946a56c428..d261b7150c 100644 --- a/fpdfsdk/fpdf_ext.cpp +++ b/fpdfsdk/fpdf_ext.cpp @@ -8,9 +8,9 @@ #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fpdfdoc/include/cpdf_annot.h" #include "core/fpdfdoc/include/cpdf_interform.h" #include "core/fpdfdoc/include/cpdf_metadata.h" diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp index 49520838a3..8de4d3fa74 100644 --- a/fpdfsdk/fpdf_progressive.cpp +++ b/fpdfsdk/fpdf_progressive.cpp @@ -6,9 +6,9 @@ #include "public/fpdf_progressive.h" +#include "core/fpdfapi/cpdf_pagerendercontext.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" -#include "core/fpdfapi/include/cpdf_pagerendercontext.h" #include "core/fxcrt/include/fx_memory.h" #include "core/fxge/include/cfx_fxgedevice.h" #include "core/fxge/include/cfx_renderdevice.h" diff --git a/fpdfsdk/fpdfdoc_unittest.cpp b/fpdfsdk/fpdfdoc_unittest.cpp index ca1d29277c..354608dad1 100644 --- a/fpdfsdk/fpdfdoc_unittest.cpp +++ b/fpdfsdk/fpdfdoc_unittest.cpp @@ -7,13 +7,13 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_name.h" #include "core/fpdfapi/fpdf_parser/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/cpdf_parser.h" #include "core/fpdfapi/fpdf_parser/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/cpdf_string.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp index 2c10dd9d58..0f4a427df3 100644 --- a/fpdfsdk/fpdfeditimg.cpp +++ b/fpdfsdk/fpdfeditimg.cpp @@ -6,10 +6,10 @@ #include "public/fpdf_edit.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_page/cpdf_image.h" #include "core/fpdfapi/fpdf_page/cpdf_imageobject.h" #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "fpdfsdk/include/fsdk_define.h" DLLEXPORT FPDF_PAGEOBJECT STDCALL diff --git a/fpdfsdk/fpdfeditimg_unittest.cpp b/fpdfsdk/fpdfeditimg_unittest.cpp index 2548ffe22e..a844e7ec71 100644 --- a/fpdfsdk/fpdfeditimg_unittest.cpp +++ b/fpdfsdk/fpdfeditimg_unittest.cpp @@ -4,7 +4,7 @@ #include "public/fpdf_edit.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "testing/gtest/include/gtest/gtest.h" class PDFEditTest : public testing::Test { diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index 584c436c3a..05f73e8517 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -9,14 +9,14 @@ #include #include +#include "core/fpdfapi/cpdf_modulemgr.h" +#include "core/fpdfapi/cpdf_pagerendercontext.h" #include "core/fpdfapi/fpdf_page/cpdf_page.h" #include "core/fpdfapi/fpdf_parser/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h" #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" -#include "core/fpdfapi/include/cpdf_pagerendercontext.h" #include "core/fpdfdoc/include/cpdf_annotlist.h" #include "core/fpdfdoc/include/cpdf_nametree.h" #include "core/fpdfdoc/include/cpdf_occontext.h" diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp index 15a8b3bd10..6b719606a7 100644 --- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp @@ -6,11 +6,11 @@ #include "fpdfsdk/pdfwindow/PWL_FontMap.h" +#include "core/fpdfapi/cpdf_modulemgr.h" #include "core/fpdfapi/fpdf_font/cpdf_font.h" #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h" #include "core/fpdfapi/fpdf_parser/cpdf_document.h" #include "core/fpdfapi/fpdf_parser/cpdf_parser.h" -#include "core/fpdfapi/include/cpdf_modulemgr.h" #include "core/fpdfdoc/include/ipvt_fontmap.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" -- cgit v1.2.3