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

Unified Diff: core/fpdfapi/parser/cpdf_array.h

Issue 2425783002: Revert "Make CPDF_Object containers hold objects via unique pointers." (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « core/fpdfapi/page/fpdf_page_parser.cpp ('k') | core/fpdfapi/parser/cpdf_array.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fpdfapi/parser/cpdf_array.h
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
index f473e268005d4b0bb76e3d58e55e0f930d894d45..8cfa0333bb4acbbb42dde2cfa8f4d2cd72dc32e2 100644
--- a/core/fpdfapi/parser/cpdf_array.h
+++ b/core/fpdfapi/parser/cpdf_array.h
@@ -17,8 +17,8 @@
class CPDF_Array : public CPDF_Object {
public:
- using iterator = std::vector<UniqueObject>::iterator;
- using const_iterator = std::vector<UniqueObject>::const_iterator;
+ using iterator = std::vector<CPDF_Object*>::iterator;
+ using const_iterator = std::vector<CPDF_Object*>::const_iterator;
CPDF_Array();
@@ -67,9 +67,8 @@ class CPDF_Array : public CPDF_Object {
bool bDirect,
std::set<const CPDF_Object*>* pVisited) const override;
- std::vector<UniqueObject> m_Objects;
+ std::vector<CPDF_Object*> m_Objects;
};
-
using UniqueArray = std::unique_ptr<CPDF_Array, ReleaseDeleter<CPDF_Object>>;
inline CPDF_Array* ToArray(CPDF_Object* obj) {
« no previous file with comments | « core/fpdfapi/page/fpdf_page_parser.cpp ('k') | core/fpdfapi/parser/cpdf_array.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698