From 218c846ac0509f70d6da3eb3a439fa89b589f7b5 Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 11 Mar 2016 06:10:30 -0800 Subject: Revert of Use std::unique_ptr. (patchset #8 id:130001 of https://codereview.chromium.org/1780933003/ ) Reason for revert: Another Android ambiguity due to implicit bool... frameworks/base/core/jni/android/graphics/Utils.cpp:110:35: error: call of overloaded 'SkMemoryStream(SkAutoTUnref&)' is ambiguous return new SkMemoryStream(data); Original issue's description: > Use std::unique_ptr. > > TBR=reed@google.com > > Committed: https://skia.googlesource.com/skia/+/20c1e3abfc681771f73eb19fde7284196e028940 > > Committed: https://skia.googlesource.com/skia/+/3dd9ed37c24611af86f0fe374bd3698b63f09450 TBR=bungeman@google.com,mtklein@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/1785353002 --- tests/ClearTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/ClearTest.cpp') diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp index 25fcf85849..df152089fb 100644 --- a/tests/ClearTest.cpp +++ b/tests/ClearTest.cpp @@ -62,7 +62,7 @@ static bool reset_dc(SkAutoTUnref* dc, SkAutoTUnref* r GrRenderTarget* rt = (*rtKeepAlive)->asRenderTarget(); SkASSERT(rt->getUniqueID() != oldID); dc->reset(context->drawContext(rt)); - return *dc != nullptr; + return SkToBool(*dc); } DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, context) { -- cgit v1.2.3