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

Side by Side Diff: core/fpdfapi/fpdf_parser/cpdf_reference.cpp

Issue 2386433002: Move CPDF_Reference::SafeGetDirect() out of the header. (Closed)
Patch Set: rebase 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/fpdf_parser/cpdf_reference.h ('k') | no next file » | 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 // 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/fpdf_parser/cpdf_reference.h" 7 #include "core/fpdfapi/fpdf_parser/cpdf_reference.h"
8 8
9 #include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h" 9 #include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h"
10 #include "third_party/base/stl_util.h" 10 #include "third_party/base/stl_util.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 pVisited->insert(this); 60 pVisited->insert(this);
61 if (bDirect) { 61 if (bDirect) {
62 auto* pDirect = GetDirect(); 62 auto* pDirect = GetDirect();
63 return pDirect && !pdfium::ContainsKey(*pVisited, pDirect) 63 return pDirect && !pdfium::ContainsKey(*pVisited, pDirect)
64 ? pDirect->CloneNonCyclic(true, pVisited) 64 ? pDirect->CloneNonCyclic(true, pVisited)
65 : nullptr; 65 : nullptr;
66 } 66 }
67 return new CPDF_Reference(m_pObjList, m_RefObjNum); 67 return new CPDF_Reference(m_pObjList, m_RefObjNum);
68 } 68 }
69 69
70 CPDF_Object* CPDF_Reference::SafeGetDirect() const {
71 CPDF_Object* obj = GetDirect();
72 return (obj && !obj->IsReference()) ? obj : nullptr;
73 }
74
70 void CPDF_Reference::SetRef(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum) { 75 void CPDF_Reference::SetRef(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum) {
71 m_pObjList = pDoc; 76 m_pObjList = pDoc;
72 m_RefObjNum = objnum; 77 m_RefObjNum = objnum;
73 } 78 }
74 79
75 CPDF_Object* CPDF_Reference::GetDirect() const { 80 CPDF_Object* CPDF_Reference::GetDirect() const {
76 return m_pObjList ? m_pObjList->GetOrParseIndirectObject(m_RefObjNum) 81 return m_pObjList ? m_pObjList->GetOrParseIndirectObject(m_RefObjNum)
77 : nullptr; 82 : nullptr;
78 } 83 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_reference.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698