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

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

Issue 2489283003: Make AddIndirectObject() take a unique_ptr. (Closed)
Patch Set: Fix test 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 m_pByteStringPool(pdfium::MakeUnique<CFX_ByteStringPool>()) {} 19 m_pByteStringPool(pdfium::MakeUnique<CFX_ByteStringPool>()) {}
20 20
21 CFDF_Document::~CFDF_Document() { 21 CFDF_Document::~CFDF_Document() {
22 if (m_bOwnFile && m_pFile) 22 if (m_bOwnFile && m_pFile)
23 m_pFile->Release(); 23 m_pFile->Release();
24 m_pByteStringPool.DeleteObject(); // Make weak. 24 m_pByteStringPool.DeleteObject(); // Make weak.
25 } 25 }
26 26
27 CFDF_Document* CFDF_Document::CreateNewDoc() { 27 CFDF_Document* CFDF_Document::CreateNewDoc() {
28 CFDF_Document* pDoc = new CFDF_Document; 28 CFDF_Document* pDoc = new CFDF_Document;
29 pDoc->m_pRootDict = new CPDF_Dictionary(pDoc->GetByteStringPool()); 29 pDoc->m_pRootDict =
30 pDoc->AddIndirectObject(pDoc->m_pRootDict); 30 pDoc->NewIndirect<CPDF_Dictionary>(pDoc->GetByteStringPool());
31 pDoc->m_pRootDict->SetFor("FDF", 31 pDoc->m_pRootDict->SetFor("FDF",
32 new CPDF_Dictionary(pDoc->GetByteStringPool())); 32 new CPDF_Dictionary(pDoc->GetByteStringPool()));
33 return pDoc; 33 return pDoc;
34 } 34 }
35 35
36 CFDF_Document* CFDF_Document::ParseFile(IFX_SeekableReadStream* pFile, 36 CFDF_Document* CFDF_Document::ParseFile(IFX_SeekableReadStream* pFile,
37 bool bOwnFile) { 37 bool bOwnFile) {
38 if (!pFile) 38 if (!pFile)
39 return nullptr; 39 return nullptr;
40 40
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 buf << "%FDF-1.2\r\n"; 99 buf << "%FDF-1.2\r\n";
100 for (const auto& pair : *this) 100 for (const auto& pair : *this)
101 buf << pair.first << " 0 obj\r\n" 101 buf << pair.first << " 0 obj\r\n"
102 << pair.second.get() << "\r\nendobj\r\n\r\n"; 102 << pair.second.get() << "\r\nendobj\r\n\r\n";
103 103
104 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 104 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
105 << " 0 R>>\r\n%%EOF\r\n"; 105 << " 0 R>>\r\n%%EOF\r\n";
106 return true; 106 return true;
107 } 107 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698