summaryrefslogtreecommitdiff
path: root/core/fpdfdoc
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-11-04 11:38:40 -0700
committerCommit bot <commit-bot@chromium.org>2016-11-04 11:38:40 -0700
commit33fdebc3da676bff84d0fd0f69b9087c0c12dfeb (patch)
tree274499f6bc4df60ebb57a52bf78b82180ea52295 /core/fpdfdoc
parent761eed284e1248f851fbb23beaa45835b644ecee (diff)
downloadpdfium-33fdebc3da676bff84d0fd0f69b9087c0c12dfeb.tar.xz
Reland "Remove CPDF_Object::Release() in favor of direct delete"
This reverts commit f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3. Review-Url: https://codereview.chromium.org/2478303002
Diffstat (limited to 'core/fpdfdoc')
-rw-r--r--core/fpdfdoc/cpdf_annot.cpp2
-rw-r--r--core/fpdfdoc/cpdf_filespec_unittest.cpp17
-rw-r--r--core/fpdfdoc/cpdf_formfield.cpp3
3 files changed, 7 insertions, 15 deletions
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<CPDF_Object, ReleaseDeleter<CPDF_Object>>;
-using ScopedDict =
- std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>>;
-}
-
TEST(cpdf_filespec, EncodeDecodeFileName) {
std::vector<pdfium::NullTermWstrFuncTestData> 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<CPDF_Object> 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<CPDF_Dictionary> 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<CPDF_Object> 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<CPDF_Object> 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<CPDF_Dictionary> 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<CPDF_Array, ReleaseDeleter<CPDF_Array>> pArray(
- new CPDF_Array);
+ std::unique_ptr<CPDF_Array> pArray(new CPDF_Array);
for (int i = 0; i < CountOptions(); i++) {
if (i != index && IsItemSelected(i)) {
opt_value = GetOptionValue(i);