diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-11-04 08:25:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-11-04 08:25:34 -0700 |
| commit | f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3 (patch) | |
| tree | edc3d5f35225971679e581c8ef951de8275a944b /core/fxge | |
| parent | 4de3d095c9d9e961f93750cf1ebd489fd515be12 (diff) | |
| download | pdfium-f0d5b6c35fa343108a3ab7a25bc2cc2b3cf105b3.tar.xz | |
Revert of Remove CPDF_Object::Release() in favor of direct delete (patchset #11 id:200001 of https://codereview.chromium.org/2384883003/ )
Reason for revert:
Looks like it's blocking the roll.
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_compile_dbg_ng/builds/186619
Original issue's description:
> Remove CPDF_Object::Release() in favor of direct delete
>
> Follow-on once we prove Release always deletes in previous CL.
>
> Committed: https://pdfium.googlesource.com/pdfium/+/4de3d095c9d9e961f93750cf1ebd489fd515be12
TBR=thestig@chromium.org,tsepez@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2478253002
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/dib/fx_dib_engine_unittest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/core/fxge/dib/fx_dib_engine_unittest.cpp b/core/fxge/dib/fx_dib_engine_unittest.cpp index 57e829e9d2..3f8abe1c97 100644 --- a/core/fxge/dib/fx_dib_engine_unittest.cpp +++ b/core/fxge/dib/fx_dib_engine_unittest.cpp @@ -12,16 +12,15 @@ #include "core/fxge/dib/dib_int.h" #include "core/fxge/fx_dib.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/base/ptr_util.h" TEST(CStretchEngine, OverflowInCtor) { FX_RECT clip_rect; - std::unique_ptr<CPDF_Dictionary> dict_obj = - pdfium::MakeUnique<CPDF_Dictionary>(); + std::unique_ptr<CPDF_Dictionary, ReleaseDeleter<CPDF_Dictionary>> dict_obj( + new CPDF_Dictionary()); dict_obj->SetFor("Width", new CPDF_Number(71000)); dict_obj->SetFor("Height", new CPDF_Number(12500)); - std::unique_ptr<CPDF_Stream> stream = - pdfium::MakeUnique<CPDF_Stream>(nullptr, 0, dict_obj.release()); + std::unique_ptr<CPDF_Stream, ReleaseDeleter<CPDF_Stream>> stream( + new CPDF_Stream(nullptr, 0, dict_obj.release())); CPDF_DIBSource dib_source; dib_source.Load(nullptr, stream.get(), nullptr, nullptr, nullptr, nullptr, false, 0, false); |