diff options
| author | tsepez <tsepez@chromium.org> | 2016-11-16 17:31:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-16 17:31:18 -0800 |
| commit | 5913a6ca71c85401e3f5317758d44a9fc4a667b2 (patch) | |
| tree | 388ad0bd98b44a47c251568e198e2c3c231c7d30 /core/fpdfapi/parser/cpdf_object_unittest.cpp | |
| parent | cc4d0a44f3025821f88f3ed1ee78dfdc416487c7 (diff) | |
| download | pdfium-5913a6ca71c85401e3f5317758d44a9fc4a667b2.tar.xz | |
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
Diffstat (limited to 'core/fpdfapi/parser/cpdf_object_unittest.cpp')
| -rw-r--r-- | core/fpdfapi/parser/cpdf_object_unittest.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/fpdfapi/parser/cpdf_object_unittest.cpp b/core/fpdfapi/parser/cpdf_object_unittest.cpp index c341284602..2de6256912 100644 --- a/core/fpdfapi/parser/cpdf_object_unittest.cpp +++ b/core/fpdfapi/parser/cpdf_object_unittest.cpp @@ -56,7 +56,7 @@ class PDFObjectsTest : public testing::Test { CPDF_String* str_reg_obj = new CPDF_String(L"A simple test"); CPDF_String* str_spec_obj = new CPDF_String(L"\t\n"); // Name object. - CPDF_Name* name_obj = new CPDF_Name("space"); + CPDF_Name* name_obj = new CPDF_Name(nullptr, "space"); // Array object. m_ArrayObj = new CPDF_Array; m_ArrayObj->InsertNewAt<CPDF_Number>(0, 8902); @@ -620,12 +620,12 @@ TEST(PDFArrayTest, GetTypeAt) { arr_val->AddNew<CPDF_Number>(2); CPDF_Dictionary* dict_val = arr->InsertNewAt<CPDF_Dictionary>(12); - dict_val->SetFor("key1", new CPDF_String("Linda", false)); - dict_val->SetFor("key2", new CPDF_String("Zoe", false)); + dict_val->SetFor("key1", new CPDF_String(nullptr, "Linda", false)); + dict_val->SetFor("key2", new CPDF_String(nullptr, "Zoe", false)); CPDF_Dictionary* stream_dict = new CPDF_Dictionary(); - stream_dict->SetFor("key1", new CPDF_String("John", false)); - stream_dict->SetFor("key2", new CPDF_String("King", false)); + stream_dict->SetFor("key1", new CPDF_String(nullptr, "John", false)); + stream_dict->SetFor("key2", new CPDF_String(nullptr, "King", false)); uint8_t data[] = "A stream for test"; // The data buffer will be owned by stream object, so it needs to be // dynamically allocated. @@ -710,8 +710,9 @@ TEST(PDFArrayTest, AddReferenceAndGetObjectAt) { CPDF_Boolean* boolean_obj = new CPDF_Boolean(true); CPDF_Number* int_obj = new CPDF_Number(-1234); CPDF_Number* float_obj = new CPDF_Number(2345.089f); - CPDF_String* str_obj = new CPDF_String("Adsfdsf 343434 %&&*\n", false); - CPDF_Name* name_obj = new CPDF_Name("Title:"); + CPDF_String* str_obj = + new CPDF_String(nullptr, "Adsfdsf 343434 %&&*\n", false); + CPDF_Name* name_obj = new CPDF_Name(nullptr, "Title:"); CPDF_Null* null_obj = new CPDF_Null(); CPDF_Object* indirect_objs[] = {boolean_obj, int_obj, float_obj, str_obj, name_obj, null_obj}; |