summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-06-26 15:19:38 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-06-26 15:19:38 +0000
commitb86544285e263310c1017a3aa056d71e68c5d5a1 (patch)
treef35299979dadda2c22f580606e8164cdc84e0d36 /core
parent8625d3b73eb51d2100cdf15e7a43b998b8251dc9 (diff)
downloadpdfium-b86544285e263310c1017a3aa056d71e68c5d5a1.tar.xz
Make CPDF_Document::m_pRootDict an UnownedPtr<>.
In turn, this requires making some of the tests use an indirect root dictionary so as to satisfy the lifetime requirements. Change-Id: Ibdbe294a76200d4486134e5848c169a6c2d802bf Reviewed-on: https://pdfium-review.googlesource.com/36110 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/parser/cpdf_document.h8
-rw-r--r--core/fpdfapi/parser/cpdf_document_unittest.cpp31
2 files changed, 13 insertions, 26 deletions
diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h
index 94d20504c5..db659b38c8 100644
--- a/core/fpdfapi/parser/cpdf_document.h
+++ b/core/fpdfapi/parser/cpdf_document.h
@@ -61,8 +61,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
}
CPDF_Parser* GetParser() const { return m_pParser.get(); }
- const CPDF_Dictionary* GetRoot() const { return m_pRootDict; }
- CPDF_Dictionary* GetRoot() { return m_pRootDict; }
+ CPDF_Dictionary* GetRoot() const { return m_pRootDict.Get(); }
CPDF_Dictionary* GetInfo();
void DeletePage(int iPage);
@@ -148,10 +147,7 @@ class CPDF_Document : public CPDF_IndirectObjectHolder {
void ResetTraversal();
std::unique_ptr<CPDF_Parser> m_pParser;
-
- // TODO(tsepez): figure out why tests break if this is an UnownedPtr.
- CPDF_Dictionary* m_pRootDict; // Not owned.
-
+ UnownedPtr<CPDF_Dictionary> m_pRootDict;
UnownedPtr<CPDF_Dictionary> m_pInfoDict;
// Vector of pairs to know current position in the page tree. The index in the
diff --git a/core/fpdfapi/parser/cpdf_document_unittest.cpp b/core/fpdfapi/parser/cpdf_document_unittest.cpp
index f06a7f42d3..fa52d3bc7f 100644
--- a/core/fpdfapi/parser/cpdf_document_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_document_unittest.cpp
@@ -87,20 +87,16 @@ class CPDF_TestDocumentForPages : public CPDF_Document {
CPDF_Dictionary* pagesDict =
CreatePageTreeNode(std::move(allPages), this, kNumTestPages);
- m_pOwnedRootDict = pdfium::MakeUnique<CPDF_Dictionary>();
- m_pOwnedRootDict->SetNewFor<CPDF_Reference>("Pages", this,
- pagesDict->GetObjNum());
- m_pRootDict = m_pOwnedRootDict.get();
+ m_pRootDict = NewIndirect<CPDF_Dictionary>();
+ m_pRootDict->SetNewFor<CPDF_Reference>("Pages", this,
+ pagesDict->GetObjNum());
m_PageList.resize(kNumTestPages);
}
void SetTreeSize(int size) {
- m_pOwnedRootDict->SetNewFor<CPDF_Number>("Count", size);
+ m_pRootDict->SetNewFor<CPDF_Number>("Count", size);
m_PageList.resize(size);
}
-
- private:
- std::unique_ptr<CPDF_Dictionary> m_pOwnedRootDict;
};
class CPDF_TestDocumentWithPageWithoutPageNum : public CPDF_Document {
@@ -116,17 +112,15 @@ class CPDF_TestDocumentWithPageWithoutPageNum : public CPDF_Document {
inlined_page_ = allPages->Add(CreateNumberedPage(2));
CPDF_Dictionary* pagesDict =
CreatePageTreeNode(std::move(allPages), this, 3);
- m_pOwnedRootDict = pdfium::MakeUnique<CPDF_Dictionary>();
- m_pOwnedRootDict->SetNewFor<CPDF_Reference>("Pages", this,
- pagesDict->GetObjNum());
- m_pRootDict = m_pOwnedRootDict.get();
+ m_pRootDict = NewIndirect<CPDF_Dictionary>();
+ m_pRootDict->SetNewFor<CPDF_Reference>("Pages", this,
+ pagesDict->GetObjNum());
m_PageList.resize(3);
}
const CPDF_Object* inlined_page() const { return inlined_page_; }
private:
- std::unique_ptr<CPDF_Dictionary> m_pOwnedRootDict;
const CPDF_Object* inlined_page_;
};
@@ -143,15 +137,12 @@ class CPDF_TestDocPagesWithoutKids : public CPDF_Document {
pagesDict->SetNewFor<CPDF_Name>("Type", "Pages");
pagesDict->SetNewFor<CPDF_Number>("Count", 3);
m_PageList.resize(10);
- m_pOwnedRootDict = pdfium::MakeUnique<CPDF_Dictionary>();
- m_pOwnedRootDict->SetNewFor<CPDF_Reference>("Pages", this,
- pagesDict->GetObjNum());
- m_pRootDict = m_pOwnedRootDict.get();
+ m_pRootDict = NewIndirect<CPDF_Dictionary>();
+ m_pRootDict->SetNewFor<CPDF_Reference>("Pages", this,
+ pagesDict->GetObjNum());
}
-
- private:
- std::unique_ptr<CPDF_Dictionary> m_pOwnedRootDict;
};
+
} // namespace
class cpdf_document_test : public testing::Test {