From 0024a22b4a793630a1a8e8d85c4525c7b82a3ed7 Mon Sep 17 00:00:00 2001 From: weili Date: Sun, 24 Jul 2016 08:26:49 -0700 Subject: Remove CFX_Deletable Change the last use of CFX_Deletable to its actual type and remove the use of CFX_Deletable. Review-Url: https://codereview.chromium.org/2178613002 --- core/fpdfapi/fpdf_parser/cpdf_document.cpp | 1 + core/fpdfapi/fpdf_parser/include/cpdf_document.h | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/fpdf_parser') diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp index 485d538832..605fb6e878 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp @@ -18,6 +18,7 @@ #include "core/fpdfapi/fpdf_parser/include/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/fx_font.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h index 24d400fcd7..63141bf297 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h @@ -25,6 +25,7 @@ class CPDF_IccProfile; class CPDF_Image; class CPDF_Pattern; class CPDF_StreamAcc; +class JBig2_DocumentContext; #define FPDFPERM_PRINT 0x0004 #define FPDFPERM_MODIFY 0x0008 @@ -58,7 +59,9 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { void ClearPageData(); void RemoveColorSpaceFromPageData(CPDF_Object* pObject); - std::unique_ptr* CodecContext() { return &m_pCodecContext; } + std::unique_ptr* CodecContext() { + return &m_pCodecContext; + } std::unique_ptr* LinksContext() { return &m_pLinksContext; } CPDF_DocRenderData* GetRenderData() const { return m_pDocRender.get(); } @@ -134,7 +137,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder { // TODO(thestig): Figure out why this cannot be a std::unique_ptr. CPDF_DocPageData* m_pDocPage; std::unique_ptr m_pDocRender; - std::unique_ptr m_pCodecContext; + std::unique_ptr m_pCodecContext; std::unique_ptr m_pLinksContext; }; -- cgit v1.2.3