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

Side by Side Diff: fpdfsdk/fpdfdoc_unittest.cpp

Issue 2361713002: Remove some objnum locals with AddIndirectObject (Closed)
Patch Set: Same treatment for arrays Created 4 years, 3 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 | « fpdfsdk/fpdf_transformpage.cpp ('k') | fpdfsdk/fpdfppo.cpp » ('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 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 #include "public/fpdf_doc.h" 5 #include "public/fpdf_doc.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" 10 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 m_pRootObj.reset(); 72 m_pRootObj.reset();
73 m_pIndirectObjs = nullptr; 73 m_pIndirectObjs = nullptr;
74 m_pDoc.reset(); 74 m_pDoc.reset();
75 CPDF_ModuleMgr::Destroy(); 75 CPDF_ModuleMgr::Destroy();
76 } 76 }
77 77
78 std::vector<DictObjInfo> CreateDictObjs(int num) { 78 std::vector<DictObjInfo> CreateDictObjs(int num) {
79 std::vector<DictObjInfo> info; 79 std::vector<DictObjInfo> info;
80 for (int i = 0; i < num; ++i) { 80 for (int i = 0; i < num; ++i) {
81 // Objects created will be released by the document. 81 // Objects created will be released by the document.
82 CPDF_Dictionary* obj(new CPDF_Dictionary()); 82 CPDF_Dictionary* obj = new CPDF_Dictionary;
83 m_pIndirectObjs->AddIndirectObject(obj); 83 info.push_back({m_pIndirectObjs->AddIndirectObject(obj), obj});
84 info.push_back({obj->GetObjNum(), obj});
85 } 84 }
86 return info; 85 return info;
87 } 86 }
88 87
89 protected: 88 protected:
90 std::unique_ptr<CPDF_TestPdfDocument> m_pDoc; 89 std::unique_ptr<CPDF_TestPdfDocument> m_pDoc;
91 CPDF_IndirectObjectHolder* m_pIndirectObjs; 90 CPDF_IndirectObjectHolder* m_pIndirectObjs;
92 std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> m_pRootObj; 91 std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> m_pRootObj;
93 }; 92 };
94 93
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 // Title with no match. 224 // Title with no match.
226 std::unique_ptr<unsigned short, pdfium::FreeDeleter> title = 225 std::unique_ptr<unsigned short, pdfium::FreeDeleter> title =
227 GetFPDFWideString(L"Chapter 8"); 226 GetFPDFWideString(L"Chapter 8");
228 EXPECT_EQ(nullptr, FPDFBookmark_Find(m_pDoc.get(), title.get())); 227 EXPECT_EQ(nullptr, FPDFBookmark_Find(m_pDoc.get(), title.get()));
229 228
230 // Title with a match. 229 // Title with a match.
231 title = GetFPDFWideString(L"Chapter 3"); 230 title = GetFPDFWideString(L"Chapter 3");
232 EXPECT_EQ(bookmarks[3].obj, FPDFBookmark_Find(m_pDoc.get(), title.get())); 231 EXPECT_EQ(bookmarks[3].obj, FPDFBookmark_Find(m_pDoc.get(), title.get()));
233 } 232 }
234 } 233 }
OLDNEW
« no previous file with comments | « fpdfsdk/fpdf_transformpage.cpp ('k') | fpdfsdk/fpdfppo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698