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

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

Issue 2419173002: Update CPDF_IndirectObjectHolder APIs for unique objects (Closed)
Patch Set: Fix issues Created 4 years, 2 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
« no previous file with comments | « core/fpdfapi/page/cpdf_image.cpp ('k') | core/fpdfapi/parser/cpdf_array.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 = pDoc->AddIndirectDictionary(pDoc->GetByteStringPool());
30 pDoc->AddIndirectObject(pDoc->m_pRootDict);
31 pDoc->m_pRootDict->SetFor("FDF", 30 pDoc->m_pRootDict->SetFor("FDF",
32 new CPDF_Dictionary(pDoc->GetByteStringPool())); 31 new CPDF_Dictionary(pDoc->GetByteStringPool()));
33 return pDoc; 32 return pDoc;
34 } 33 }
35 34
36 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) { 35 CFDF_Document* CFDF_Document::ParseFile(IFX_FileRead* pFile, FX_BOOL bOwnFile) {
37 if (!pFile) 36 if (!pFile)
38 return nullptr; 37 return nullptr;
39 38
40 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document); 39 std::unique_ptr<CFDF_Document> pDoc(new CFDF_Document);
(...skipping 21 matching lines...) Expand all
62 break; 61 break;
63 62
64 word = parser.GetNextWord(nullptr); 63 word = parser.GetNextWord(nullptr);
65 if (word != "obj") 64 if (word != "obj")
66 break; 65 break;
67 66
68 CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true); 67 CPDF_Object* pObj = parser.GetObject(this, objnum, 0, true);
69 if (!pObj) 68 if (!pObj)
70 break; 69 break;
71 70
72 ReplaceIndirectObjectIfHigherGeneration(objnum, pObj); 71 // TODO(tsepez): check |pObj| ownership.
72 ReplaceIndirectObjectIfHigherGeneration(objnum, UniqueObject(pObj));
73 word = parser.GetNextWord(nullptr); 73 word = parser.GetNextWord(nullptr);
74 if (word != "endobj") 74 if (word != "endobj")
75 break; 75 break;
76 } else { 76 } else {
77 if (word != "trailer") 77 if (word != "trailer")
78 break; 78 break;
79 79
80 if (CPDF_Dictionary* pMainDict = 80 if (CPDF_Dictionary* pMainDict =
81 ToDictionary(parser.GetObject(this, 0, 0, true))) { 81 ToDictionary(parser.GetObject(this, 0, 0, true))) {
82 m_pRootDict = pMainDict->GetDictFor("Root"); 82 m_pRootDict = pMainDict->GetDictFor("Root");
(...skipping 10 matching lines...) Expand all
93 93
94 buf << "%FDF-1.2\r\n"; 94 buf << "%FDF-1.2\r\n";
95 for (const auto& pair : *this) 95 for (const auto& pair : *this)
96 buf << pair.first << " 0 obj\r\n" 96 buf << pair.first << " 0 obj\r\n"
97 << pair.second.get() << "\r\nendobj\r\n\r\n"; 97 << pair.second.get() << "\r\nendobj\r\n\r\n";
98 98
99 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum() 99 buf << "trailer\r\n<</Root " << m_pRootDict->GetObjNum()
100 << " 0 R>>\r\n%%EOF\r\n"; 100 << " 0 R>>\r\n%%EOF\r\n";
101 return TRUE; 101 return TRUE;
102 } 102 }
OLDNEW
« no previous file with comments | « core/fpdfapi/page/cpdf_image.cpp ('k') | core/fpdfapi/parser/cpdf_array.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698