From 119dc646ff7c108cc7319dbc11e05958d98fadfe Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 11 Aug 2015 14:08:47 -0700 Subject: Merge to XFA: Remove dead code from CPDF_Metadata. Add missing nullptr check. BUG=pdfium:117 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1282653002 . (cherry picked from commit 1e2ece0cf98f8daecdea5b45ebd20cedbcef4bd9) Review URL: https://codereview.chromium.org/1274803004 . --- core/include/fpdfdoc/fpdf_doc.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'core/include/fpdfdoc') diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 22fdf546da..071386e2e3 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -9,6 +9,7 @@ #include +#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fpdfapi/fpdf_parser.h" #include "../fpdfapi/fpdf_render.h" @@ -1157,23 +1158,19 @@ class CPDF_PageLabel { protected: CPDF_Document* m_pDocument; }; + class CPDF_Metadata { public: - CPDF_Metadata(); - + explicit CPDF_Metadata(CPDF_Document* pDoc); ~CPDF_Metadata(); - void LoadDoc(CPDF_Document* pDoc); - - int32_t GetString(const CFX_ByteStringC& bsItem, CFX_WideString& wsStr); - - CXML_Element* GetRoot() const; + const CXML_Element* GetRoot() const; - CXML_Element* GetRDF() const; - - protected: - void* m_pData; + private: + CPDF_Document* const m_pDoc; // Not owned. + nonstd::unique_ptr m_pXmlElement; }; + class CPDF_ViewerPreferences { public: CPDF_ViewerPreferences(CPDF_Document* pDoc); -- cgit v1.2.3