diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-15 14:32:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-15 14:32:49 -0700 |
| commit | e0ad6a4af5d9c5f5671a9ecd0aa437dedae52b16 (patch) | |
| tree | 9d620999954853fe7512db8e699cf77537c3ba05 /core/fpdfdoc | |
| parent | 7cf555202756c51ce2b5ae18efdeb6e1bb6a9e41 (diff) | |
| download | pdfium-e0ad6a4af5d9c5f5671a9ecd0aa437dedae52b16.tar.xz | |
Avoid narrowing to StringC in CPDF_Name and CPDF_NameTree
Remove redundant CPDF_Name constructors given promotion rules.
Rework one char* in CPDF_PageContentGenerator.
Review URL: https://codereview.chromium.org/1890973006
Diffstat (limited to 'core/fpdfdoc')
| -rw-r--r-- | core/fpdfdoc/doc_basic.cpp | 19 | ||||
| -rw-r--r-- | core/fpdfdoc/include/fpdf_doc.h | 5 |
2 files changed, 15 insertions, 9 deletions
diff --git a/core/fpdfdoc/doc_basic.cpp b/core/fpdfdoc/doc_basic.cpp index a3e94cb033..a0c6b2babc 100644 --- a/core/fpdfdoc/doc_basic.cpp +++ b/core/fpdfdoc/doc_basic.cpp @@ -71,12 +71,19 @@ FX_FLOAT CPDF_Dest::GetParam(int index) { CFX_ByteString CPDF_Dest::GetRemoteName() { return m_pObj ? m_pObj->GetString() : CFX_ByteString(); } + CPDF_NameTree::CPDF_NameTree(CPDF_Document* pDoc, - const CFX_ByteStringC& category) { - if (pDoc->GetRoot() && pDoc->GetRoot()->GetDictBy("Names")) - m_pRoot = pDoc->GetRoot()->GetDictBy("Names")->GetDictBy(category); - else - m_pRoot = NULL; + const CFX_ByteString& category) + : m_pRoot(nullptr) { + CPDF_Dictionary* pRoot = pDoc->GetRoot(); + if (!pRoot) + return; + + CPDF_Dictionary* pNames = pRoot->GetDictBy("Names"); + if (!pNames) + return; + + m_pRoot = pNames->GetDictBy(category); } static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode, @@ -233,7 +240,7 @@ CPDF_Object* CPDF_NameTree::LookupValue(const CFX_ByteString& csName) const { return SearchNameNode(m_pRoot, csName, nIndex, NULL); } CPDF_Array* CPDF_NameTree::LookupNamedDest(CPDF_Document* pDoc, - const CFX_ByteStringC& sName) { + const CFX_ByteString& sName) { CPDF_Object* pValue = LookupValue(sName); if (!pValue) { CPDF_Dictionary* pDests = pDoc->GetRoot()->GetDictBy("Dests"); diff --git a/core/fpdfdoc/include/fpdf_doc.h b/core/fpdfdoc/include/fpdf_doc.h index b8bc56b0cc..c11bf43c4e 100644 --- a/core/fpdfdoc/include/fpdf_doc.h +++ b/core/fpdfdoc/include/fpdf_doc.h @@ -51,12 +51,11 @@ class CFX_RenderDevice; class CPDF_NameTree { public: explicit CPDF_NameTree(CPDF_Dictionary* pRoot) : m_pRoot(pRoot) {} - CPDF_NameTree(CPDF_Document* pDoc, const CFX_ByteStringC& category); + CPDF_NameTree(CPDF_Document* pDoc, const CFX_ByteString& category); CPDF_Object* LookupValue(int nIndex, CFX_ByteString& csName) const; CPDF_Object* LookupValue(const CFX_ByteString& csName) const; - CPDF_Array* LookupNamedDest(CPDF_Document* pDoc, - const CFX_ByteStringC& sName); + CPDF_Array* LookupNamedDest(CPDF_Document* pDoc, const CFX_ByteString& sName); int GetIndex(const CFX_ByteString& csName) const; size_t GetCount() const; CPDF_Dictionary* GetRoot() const { return m_pRoot; } |