From 5913a6ca71c85401e3f5317758d44a9fc4a667b2 Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 16 Nov 2016 17:31:18 -0800 Subject: Make CPDF_Object subclass constructors intern strings Make CDPF_Arrays intern the object they create. Allow passing nullptr as a CFX_WeakPtr shortcut as well. Review-Url: https://codereview.chromium.org/2509123002 --- core/fpdfapi/parser/cpdf_name.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'core/fpdfapi/parser/cpdf_name.cpp') diff --git a/core/fpdfapi/parser/cpdf_name.cpp b/core/fpdfapi/parser/cpdf_name.cpp index bb46425117..5be64d39d5 100644 --- a/core/fpdfapi/parser/cpdf_name.cpp +++ b/core/fpdfapi/parser/cpdf_name.cpp @@ -9,7 +9,12 @@ #include "core/fpdfapi/parser/fpdf_parser_decode.h" #include "third_party/base/ptr_util.h" -CPDF_Name::CPDF_Name(const CFX_ByteString& str) : m_Name(str) {} +CPDF_Name::CPDF_Name(CFX_WeakPtr pPool, + const CFX_ByteString& str) + : m_Name(str) { + if (pPool) + m_Name = pPool->Intern(m_Name); +} CPDF_Name::~CPDF_Name() {} @@ -18,7 +23,7 @@ CPDF_Object::Type CPDF_Name::GetType() const { } std::unique_ptr CPDF_Name::Clone() const { - return pdfium::MakeUnique(m_Name); + return pdfium::MakeUnique(nullptr, m_Name); } CFX_ByteString CPDF_Name::GetString() const { -- cgit v1.2.3