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

Side by Side Diff: core/fpdfapi/page/cpdf_docpagedata.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/page/cpdf_docpagedata.h" 7 #include "core/fpdfapi/page/cpdf_docpagedata.h"
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <set> 10 #include <set>
11 11
12 #include "core/fdrm/crypto/fx_crypt.h" 12 #include "core/fdrm/crypto/fx_crypt.h"
13 #include "core/fpdfapi/cpdf_modulemgr.h" 13 #include "core/fpdfapi/cpdf_modulemgr.h"
14 #include "core/fpdfapi/font/cpdf_type1font.h" 14 #include "core/fpdfapi/font/cpdf_type1font.h"
15 #include "core/fpdfapi/font/font_int.h" 15 #include "core/fpdfapi/font/font_int.h"
16 #include "core/fpdfapi/page/cpdf_image.h" 16 #include "core/fpdfapi/page/cpdf_image.h"
17 #include "core/fpdfapi/page/cpdf_pagemodule.h" 17 #include "core/fpdfapi/page/cpdf_pagemodule.h"
18 #include "core/fpdfapi/page/cpdf_pattern.h" 18 #include "core/fpdfapi/page/cpdf_pattern.h"
19 #include "core/fpdfapi/page/cpdf_shadingpattern.h" 19 #include "core/fpdfapi/page/cpdf_shadingpattern.h"
20 #include "core/fpdfapi/page/cpdf_tilingpattern.h" 20 #include "core/fpdfapi/page/cpdf_tilingpattern.h"
21 #include "core/fpdfapi/parser/cpdf_array.h" 21 #include "core/fpdfapi/parser/cpdf_array.h"
22 #include "core/fpdfapi/parser/cpdf_dictionary.h" 22 #include "core/fpdfapi/parser/cpdf_dictionary.h"
23 #include "core/fpdfapi/parser/cpdf_document.h" 23 #include "core/fpdfapi/parser/cpdf_document.h"
24 #include "core/fpdfapi/parser/cpdf_name.h"
24 #include "core/fpdfapi/parser/cpdf_stream_acc.h" 25 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
25 #include "third_party/base/stl_util.h" 26 #include "third_party/base/stl_util.h"
26 27
27 CPDF_DocPageData::CPDF_DocPageData(CPDF_Document* pPDFDoc) 28 CPDF_DocPageData::CPDF_DocPageData(CPDF_Document* pPDFDoc)
28 : m_pPDFDoc(pPDFDoc), m_bForceClear(false) {} 29 : m_pPDFDoc(pPDFDoc), m_bForceClear(false) {}
29 30
30 CPDF_DocPageData::~CPDF_DocPageData() { 31 CPDF_DocPageData::~CPDF_DocPageData() {
31 Clear(false); 32 Clear(false);
32 Clear(true); 33 Clear(true);
33 34
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 continue; 170 continue;
170 171
171 CPDF_Type1Font* pT1Font = pFont->AsType1Font(); 172 CPDF_Type1Font* pT1Font = pFont->AsType1Font();
172 if (pEncoding && !pT1Font->GetEncoding()->IsIdentical(pEncoding)) 173 if (pEncoding && !pT1Font->GetEncoding()->IsIdentical(pEncoding))
173 continue; 174 continue;
174 175
175 return fontData->AddRef(); 176 return fontData->AddRef();
176 } 177 }
177 178
178 CPDF_Dictionary* pDict = m_pPDFDoc->NewIndirect<CPDF_Dictionary>(); 179 CPDF_Dictionary* pDict = m_pPDFDoc->NewIndirect<CPDF_Dictionary>();
179 pDict->SetNameFor("Type", "Font"); 180 pDict->SetNewFor<CPDF_Name>("Type", "Font");
180 pDict->SetNameFor("Subtype", "Type1"); 181 pDict->SetNewFor<CPDF_Name>("Subtype", "Type1");
181 pDict->SetNameFor("BaseFont", fontName); 182 pDict->SetNewFor<CPDF_Name>("BaseFont", fontName);
182 if (pEncoding) { 183 if (pEncoding) {
183 pDict->SetFor("Encoding", 184 pDict->SetFor(
184 pEncoding->Realize(m_pPDFDoc->GetByteStringPool())); 185 "Encoding",
186 pdfium::WrapUnique(pEncoding->Realize(m_pPDFDoc->GetByteStringPool())));
185 } 187 }
186 188
187 std::unique_ptr<CPDF_Font> pFont = CPDF_Font::Create(m_pPDFDoc, pDict); 189 std::unique_ptr<CPDF_Font> pFont = CPDF_Font::Create(m_pPDFDoc, pDict);
188 if (!pFont) 190 if (!pFont)
189 return nullptr; 191 return nullptr;
190 192
191 CPDF_CountedFont* fontData = new CPDF_CountedFont(pFont.release()); 193 CPDF_CountedFont* fontData = new CPDF_CountedFont(pFont.release());
192 m_FontMap[pDict] = fontData; 194 m_FontMap[pDict] = fontData;
193 return fontData->AddRef(); 195 return fontData->AddRef();
194 } 196 }
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 } 529 }
528 530
529 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr( 531 CPDF_CountedPattern* CPDF_DocPageData::FindPatternPtr(
530 CPDF_Object* pPatternObj) const { 532 CPDF_Object* pPatternObj) const {
531 if (!pPatternObj) 533 if (!pPatternObj)
532 return nullptr; 534 return nullptr;
533 535
534 auto it = m_PatternMap.find(pPatternObj); 536 auto it = m_PatternMap.find(pPatternObj);
535 return it != m_PatternMap.end() ? it->second : nullptr; 537 return it != m_PatternMap.end() ? it->second : nullptr;
536 } 538 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698