diff options
author | tsepez <tsepez@chromium.org> | 2016-11-18 16:22:41 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-11-18 16:22:41 -0800 |
commit | 0e606b5ecd6e45f74391f110cc1fe0cce0e80c64 (patch) | |
tree | 07c55fac710b191cf5d1d6595c63b90ca52e3cbb /core/fpdfdoc/cpdf_formfield_unittest.cpp | |
parent | 430ab8363e77c48b2c2435af4d289f85e2be1b96 (diff) | |
download | pdfium-0e606b5ecd6e45f74391f110cc1fe0cce0e80c64.tar.xz |
Make CPDF_Dictionary use unique pointers.chromium/2926
Some changes were required to match underlying ctors
as invoked by the templated methods.
Many release() calls go away, a few WrapUniques() are
introduced to avoid going deeper into other code.
Review-Url: https://codereview.chromium.org/2510223002
Diffstat (limited to 'core/fpdfdoc/cpdf_formfield_unittest.cpp')
-rw-r--r-- | core/fpdfdoc/cpdf_formfield_unittest.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/core/fpdfdoc/cpdf_formfield_unittest.cpp b/core/fpdfdoc/cpdf_formfield_unittest.cpp index f69df1d064..4aeda84c88 100644 --- a/core/fpdfdoc/cpdf_formfield_unittest.cpp +++ b/core/fpdfdoc/cpdf_formfield_unittest.cpp @@ -4,6 +4,8 @@ #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_indirect_object_holder.h" +#include "core/fpdfapi/parser/cpdf_name.h" +#include "core/fpdfapi/parser/cpdf_reference.h" #include "core/fpdfdoc/cpdf_formfield.h" #include "testing/gtest/include/gtest/gtest.h" @@ -13,29 +15,28 @@ TEST(cpdf_formfield, FPDF_GetFullName) { CPDF_IndirectObjectHolder obj_holder; CPDF_Dictionary* root = obj_holder.NewIndirect<CPDF_Dictionary>(); - root->SetNameFor("T", "foo"); + root->SetNewFor<CPDF_Name>("T", "foo"); name = FPDF_GetFullName(root); EXPECT_STREQ("foo", name.UTF8Encode().c_str()); CPDF_Dictionary* dict1 = obj_holder.NewIndirect<CPDF_Dictionary>(); - root->SetReferenceFor("Parent", &obj_holder, dict1); - dict1->SetNameFor("T", "bar"); + root->SetNewFor<CPDF_Reference>("Parent", &obj_holder, dict1->GetObjNum()); + dict1->SetNewFor<CPDF_Name>("T", "bar"); name = FPDF_GetFullName(root); EXPECT_STREQ("bar.foo", name.UTF8Encode().c_str()); - CPDF_Dictionary* dict2 = new CPDF_Dictionary(); - dict1->SetFor("Parent", dict2); + CPDF_Dictionary* dict2 = dict1->SetNewFor<CPDF_Dictionary>("Parent"); name = FPDF_GetFullName(root); EXPECT_STREQ("bar.foo", name.UTF8Encode().c_str()); CPDF_Dictionary* dict3 = obj_holder.NewIndirect<CPDF_Dictionary>(); - dict2->SetReferenceFor("Parent", &obj_holder, dict3); + dict2->SetNewFor<CPDF_Reference>("Parent", &obj_holder, dict3->GetObjNum()); - dict3->SetNameFor("T", "qux"); + dict3->SetNewFor<CPDF_Name>("T", "qux"); name = FPDF_GetFullName(root); EXPECT_STREQ("qux.bar.foo", name.UTF8Encode().c_str()); - dict3->SetReferenceFor("Parent", &obj_holder, root->GetObjNum()); + dict3->SetNewFor<CPDF_Reference>("Parent", &obj_holder, root->GetObjNum()); name = FPDF_GetFullName(root); EXPECT_STREQ("qux.bar.foo", name.UTF8Encode().c_str()); name = FPDF_GetFullName(dict1); |