diff options
author | dsinclair <dsinclair@chromium.org> | 2016-08-22 10:24:43 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-08-22 10:24:43 -0700 |
commit | 8d6c929d2605dc568beb73aab2c585622947fee2 (patch) | |
tree | 9144254a1bcd59bad80dd4d06d17a96977966c47 /core/fpdfapi/fpdf_parser/include/cpdf_object.h | |
parent | a4f46c57f4e4217f50e98ac74b360793284ee73f (diff) | |
download | pdfium-8d6c929d2605dc568beb73aab2c585622947fee2.tar.xz |
Revert of Move parser pointer to CPDF_Document (patchset #6 id:100001 of https://codereview.chromium.org/2253723002/ )
Reason for revert:
Causing asan issues. See crbug.com/639451.
Original issue's description:
> Move parser pointer to CPDF_Document
>
> The CPDF_IndirectObjectHolder has two subclasses, CPDF_Document and
> CFDF_Document. The CPDF document requires the parser and the CFDF document
> does not. This cl moves the parser pointer up to CPDF_Document.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/260f5fbf3553a96fa49b029cc050220039c30e2a
TBR=tsepez@chromium.org,thestig@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
Review-Url: https://codereview.chromium.org/2266033002
Diffstat (limited to 'core/fpdfapi/fpdf_parser/include/cpdf_object.h')
-rw-r--r-- | core/fpdfapi/fpdf_parser/include/cpdf_object.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_object.h b/core/fpdfapi/fpdf_parser/include/cpdf_object.h index 86f3879ce1..f637e36667 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_object.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_object.h @@ -79,10 +79,6 @@ class CPDF_Object { virtual const CPDF_String* AsString() const; protected: - friend class CPDF_Document; - friend class CPDF_IndirectObjectHolder; - friend class CPDF_Parser; - CPDF_Object() : m_ObjNum(0), m_GenNum(0) {} virtual ~CPDF_Object(); void Destroy() { delete this; } @@ -90,6 +86,9 @@ class CPDF_Object { uint32_t m_ObjNum; uint32_t m_GenNum; + friend class CPDF_IndirectObjectHolder; + friend class CPDF_Parser; + private: CPDF_Object(const CPDF_Object& src) {} }; |