From 4de3d095c9d9e961f93750cf1ebd489fd515be12 Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 3 Nov 2016 17:05:07 -0700 Subject: Remove CPDF_Object::Release() in favor of direct delete Follow-on once we prove Release always deletes in previous CL. Review-Url: https://codereview.chromium.org/2384883003 --- core/fpdfdoc/cpdf_annot.cpp | 2 +- core/fpdfdoc/cpdf_filespec_unittest.cpp | 17 +++++------------ core/fpdfdoc/cpdf_formfield.cpp | 3 +-- 3 files changed, 7 insertions(+), 15 deletions(-) (limited to 'core/fpdfdoc') diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp index 80edde8a8f..2f3fc804f3 100644 --- a/core/fpdfdoc/cpdf_annot.cpp +++ b/core/fpdfdoc/cpdf_annot.cpp @@ -57,7 +57,7 @@ CPDF_Annot::CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Annot::~CPDF_Annot() { if (m_bOwnedAnnotDict) - m_pAnnotDict->Release(); + delete m_pAnnotDict; ClearCachedAP(); } diff --git a/core/fpdfdoc/cpdf_filespec_unittest.cpp b/core/fpdfdoc/cpdf_filespec_unittest.cpp index 72b073510b..01989ee0bd 100644 --- a/core/fpdfdoc/cpdf_filespec_unittest.cpp +++ b/core/fpdfdoc/cpdf_filespec_unittest.cpp @@ -12,13 +12,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" -namespace { - -using ScopedObj = std::unique_ptr>; -using ScopedDict = - std::unique_ptr>; -} - TEST(cpdf_filespec, EncodeDecodeFileName) { std::vector test_data = { // Empty src string. @@ -74,7 +67,7 @@ TEST(cpdf_filespec, GetFileName) { L"/docs/test.pdf" #endif }; - ScopedObj str_obj(new CPDF_String(test_data.input)); + std::unique_ptr str_obj(new CPDF_String(test_data.input)); CPDF_FileSpec file_spec(str_obj.get()); CFX_WideString file_name; EXPECT_TRUE(file_spec.GetFileName(&file_name)); @@ -105,7 +98,7 @@ TEST(cpdf_filespec, GetFileName) { }; // Keyword fields in reverse order of precedence to retrieve the file name. const char* const keywords[5] = {"Unix", "Mac", "DOS", "F", "UF"}; - ScopedDict dict_obj(new CPDF_Dictionary()); + std::unique_ptr dict_obj(new CPDF_Dictionary()); CPDF_FileSpec file_spec(dict_obj.get()); CFX_WideString file_name; for (int i = 0; i < 5; ++i) { @@ -122,7 +115,7 @@ TEST(cpdf_filespec, GetFileName) { } { // Invalid object. - ScopedObj name_obj(new CPDF_Name("test.pdf")); + std::unique_ptr name_obj(new CPDF_Name("test.pdf")); CPDF_FileSpec file_spec(name_obj.get()); CFX_WideString file_name; EXPECT_FALSE(file_spec.GetFileName(&file_name)); @@ -143,7 +136,7 @@ TEST(cpdf_filespec, SetFileName) { #endif }; // String object. - ScopedObj str_obj(new CPDF_String(L"babababa")); + std::unique_ptr str_obj(new CPDF_String(L"babababa")); CPDF_FileSpec file_spec1(str_obj.get()); file_spec1.SetFileName(test_data.input); // Check internal object value. @@ -155,7 +148,7 @@ TEST(cpdf_filespec, SetFileName) { EXPECT_TRUE(file_name == test_data.input); // Dictionary object. - ScopedDict dict_obj(new CPDF_Dictionary()); + std::unique_ptr dict_obj(new CPDF_Dictionary()); CPDF_FileSpec file_spec2(dict_obj.get()); file_spec2.SetFileName(test_data.input); // Check internal object value. diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp index e82ef7800e..e2240c9f2f 100644 --- a/core/fpdfdoc/cpdf_formfield.cpp +++ b/core/fpdfdoc/cpdf_formfield.cpp @@ -575,8 +575,7 @@ bool CPDF_FormField::SetItemSelection(int index, bool bSelected, bool bNotify) { if (pValue->GetUnicodeText() == opt_value) m_pDict->RemoveFor("V"); } else if (pValue->IsArray()) { - std::unique_ptr> pArray( - new CPDF_Array); + std::unique_ptr pArray(new CPDF_Array); for (int i = 0; i < CountOptions(); i++) { if (i != index && IsItemSelected(i)) { opt_value = GetOptionValue(i); -- cgit v1.2.3