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

Unified Diff: core/fpdfapi/parser/cpdf_reference.cpp

Issue 2484033002: Return unique_ptr from CPDF_Object::Clone(). (Closed)
Patch Set: Be painfully obvious about hidden expression 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 side-by-side diff with in-line comments
Download patch
Index: core/fpdfapi/parser/cpdf_reference.cpp
diff --git a/core/fpdfapi/parser/cpdf_reference.cpp b/core/fpdfapi/parser/cpdf_reference.cpp
index a9cdf54855eb2e730558cdc0403400610ae6bb4d..8f44aa02003400ec783c566b181afde70bfa75d1 100644
--- a/core/fpdfapi/parser/cpdf_reference.cpp
+++ b/core/fpdfapi/parser/cpdf_reference.cpp
@@ -7,6 +7,7 @@
#include "core/fpdfapi/parser/cpdf_reference.h"
#include "core/fpdfapi/parser/cpdf_indirect_object_holder.h"
+#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
CPDF_Reference::CPDF_Reference(CPDF_IndirectObjectHolder* pDoc, int objnum)
@@ -50,11 +51,11 @@ const CPDF_Reference* CPDF_Reference::AsReference() const {
return this;
}
-CPDF_Object* CPDF_Reference::Clone() const {
+std::unique_ptr<CPDF_Object> CPDF_Reference::Clone() const {
return CloneObjectNonCyclic(false);
}
-CPDF_Object* CPDF_Reference::CloneNonCyclic(
+std::unique_ptr<CPDF_Object> CPDF_Reference::CloneNonCyclic(
bool bDirect,
std::set<const CPDF_Object*>* pVisited) const {
pVisited->insert(this);
@@ -64,7 +65,7 @@ CPDF_Object* CPDF_Reference::CloneNonCyclic(
? pDirect->CloneNonCyclic(true, pVisited)
: nullptr;
}
- return new CPDF_Reference(m_pObjList, m_RefObjNum);
+ return pdfium::MakeUnique<CPDF_Reference>(m_pObjList, m_RefObjNum);
}
CPDF_Object* CPDF_Reference::SafeGetDirect() const {

Powered by Google App Engine
This is Rietveld 408576698