diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-08-11 14:08:47 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-08-11 14:08:47 -0700 |
| commit | 119dc646ff7c108cc7319dbc11e05958d98fadfe (patch) | |
| tree | 287591b7caa87be7fc7def160bfb47d1a80a0f5f /core/include/fpdfdoc | |
| parent | 335e11825fcb8520f68ac668f8dacd9b48f05804 (diff) | |
| download | pdfium-119dc646ff7c108cc7319dbc11e05958d98fadfe.tar.xz | |
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 .
Diffstat (limited to 'core/include/fpdfdoc')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 19 |
1 files changed, 8 insertions, 11 deletions
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 <map> +#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<CXML_Element> m_pXmlElement; }; + class CPDF_ViewerPreferences { public: CPDF_ViewerPreferences(CPDF_Document* pDoc); |