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

Side by Side Diff: core/fpdfapi/parser/cfdf_document.cpp

Issue 2510223002: Make CPDF_Dictionary use unique pointers. (Closed)
Patch Set: Plug leaks Created 4 years, 1 month 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 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 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 #include "core/fpdfapi/parser/cfdf_document.h" 7 #include "core/fpdfapi/parser/cfdf_document.h"
8 8
9 #include "core/fpdfapi/edit/cpdf_creator.h" 9 #include "core/fpdfapi/edit/cpdf_creator.h"
10 #include "core/fpdfapi/parser/cpdf_dictionary.h" 10 #include "core/fpdfapi/parser/cpdf_dictionary.h"
11 #include "core/fpdfapi/parser/cpdf_syntax_parser.h" 11 #include "core/fpdfapi/parser/cpdf_syntax_parser.h"
12 #include "third_party/base/ptr_util.h" 12 #include "third_party/base/ptr_util.h"
13 13
14 CFDF_Document::CFDF_Document() 14 CFDF_Document::CFDF_Document()
15 : CPDF_IndirectObjectHolder(), 15 : CPDF_IndirectObjectHolder(),
16 m_pRootDict(nullptr), 16 m_pRootDict(nullptr),
17 m_pFile(nullptr), 17 m_pFile(nullptr),
18 m_bOwnFile(false) {} 18 m_bOwnFile(false) {}
19 19
20 CFDF_Document::~CFDF_Document() { 20 CFDF_Document::~CFDF_Document() {
21 if (m_bOwnFile && m_pFile) 21 if (m_bOwnFile && m_pFile)
22 m_pFile->Release(); 22 m_pFile->Release();
23 } 23 }
24 24
25 CFDF_Document* CFDF_Document::CreateNewDoc() { 25 CFDF_Document* CFDF_Document::CreateNewDoc() {
26 CFDF_Document* pDoc = new CFDF_Document; 26 CFDF_Document* pDoc = new CFDF_Document;
27 pDoc->m_pRootDict = pDoc->NewIndirect<CPDF_Dictionary>(); 27 pDoc->m_pRootDict = pDoc->NewIndirect<CPDF_Dictionary>();
28 pDoc->m_pRootDict->SetFor("FDF", 28 pDoc->m_pRootDict->SetNewFor<CPDF_Dictionary>("FDF");
29 new CPDF_Dictionary(pDoc->GetByteStringPool()));
30 return pDoc; 29 return pDoc;
31 } 30 }
32 31
33 CFDF_Document* CFDF_Document::ParseFile(IFX_SeekableReadStream* pFile, 32 CFDF_Document* CFDF_Document::ParseFile(IFX_SeekableReadStream* pFile,
34 bool bOwnFile) { 33 bool bOwnFile) {
35 if (!pFile) 34 if (!pFile)
36 return nullptr; 35 return nullptr;
37 36
38 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document); 37 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document);
39 pDoc->ParseStream(pFile, bOwnFile); 38 pDoc->ParseStream(pFile, bOwnFile);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 94
96 buf << "%FDF-1.2\r\n"; 95 buf << "%FDF-1.2\r\n";
97 for (const auto& pair : *this) 96 for (const auto& pair : *this)
98 buf << pair.first << " 0 obj\r\n" 97 buf << pair.first << " 0 obj\r\n"
99 << pair.second.get() << "\r\nendobj\r\n\r\n"; 98 << pair.second.get() << "\r\nendobj\r\n\r\n";
100 99
101 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 100 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
102 << " 0 R>>\r\n%%EOF\r\n"; 101 << " 0 R>>\r\n%%EOF\r\n";
103 return true; 102 return true;
104 } 103 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698