Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: core/fpdfapi/fpdf_parser/include/cpdf_document.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_ 7 #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_
8 #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_ 8 #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_
9 9
10 #include <memory> 10 #include <memory>
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 CPDF_DocRenderData* GetRenderData() const { return m_pDocRender.get(); } 64 CPDF_DocRenderData* GetRenderData() const { return m_pDocRender.get(); }
65 void ClearRenderData(); 65 void ClearRenderData();
66 void ClearRenderFont(); 66 void ClearRenderFont();
67 67
68 FX_BOOL IsFormStream(uint32_t objnum, FX_BOOL& bForm) const; 68 FX_BOOL IsFormStream(uint32_t objnum, FX_BOOL& bForm) const;
69 69
70 // |pFontDict| must not be null. 70 // |pFontDict| must not be null.
71 CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict); 71 CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict);
72 CPDF_ColorSpace* LoadColorSpace(CPDF_Object* pCSObj, 72 CPDF_ColorSpace* LoadColorSpace(CPDF_Object* pCSObj,
73 CPDF_Dictionary* pResources = NULL); 73 CPDF_Dictionary* pResources = nullptr);
74 74
75 CPDF_Pattern* LoadPattern(CPDF_Object* pObj, 75 CPDF_Pattern* LoadPattern(CPDF_Object* pObj,
76 FX_BOOL bShading, 76 FX_BOOL bShading,
77 const CFX_Matrix& matrix); 77 const CFX_Matrix& matrix);
78 78
79 CPDF_Image* LoadImageF(CPDF_Object* pObj); 79 CPDF_Image* LoadImageF(CPDF_Object* pObj);
80 CPDF_StreamAcc* LoadFontFile(CPDF_Stream* pStream); 80 CPDF_StreamAcc* LoadFontFile(CPDF_Stream* pStream);
81 CPDF_IccProfile* LoadIccProfile(CPDF_Stream* pStream); 81 CPDF_IccProfile* LoadIccProfile(CPDF_Stream* pStream);
82 82
83 void LoadDoc(); 83 void LoadDoc();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 uint32_t m_dwFirstPageObjNum; 132 uint32_t m_dwFirstPageObjNum;
133 CFX_ArrayTemplate<uint32_t> m_PageList; 133 CFX_ArrayTemplate<uint32_t> m_PageList;
134 // TODO(thestig): Figure out why this cannot be a std::unique_ptr. 134 // TODO(thestig): Figure out why this cannot be a std::unique_ptr.
135 CPDF_DocPageData* m_pDocPage; 135 CPDF_DocPageData* m_pDocPage;
136 std::unique_ptr<CPDF_DocRenderData> m_pDocRender; 136 std::unique_ptr<CPDF_DocRenderData> m_pDocRender;
137 std::unique_ptr<CFX_Deletable> m_pCodecContext; 137 std::unique_ptr<CFX_Deletable> m_pCodecContext;
138 std::unique_ptr<CPDF_LinkList> m_pLinksContext; 138 std::unique_ptr<CPDF_LinkList> m_pLinksContext;
139 }; 139 };
140 140
141 #endif // CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_ 141 #endif // CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_DOCUMENT_H_
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_security_handler.cpp ('k') | core/fpdfapi/fpdf_render/cpdf_pagerendercache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698