aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ImageTest.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2016-03-16 10:03:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-16 10:03:15 -0700
commite7ec417268d4be2d7921b23c131859b322badf78 (patch)
treea9bc077e6193f97fd14bb2a3bf54ab220f2453ea /tests/ImageTest.cpp
parent250581493a0859987e482810879e85e5ac2dc002 (diff)
Revert of Use std::unique_ptr. (patchset #10 id:170001 of https://codereview.chromium.org/1780933003/ )
Reason for revert: aww jeez, I dropped ps 8... 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 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1780933003 > > Committed: https://skia.googlesource.com/skia/+/2691d76a06e1af6282f8b3a3140cc93361be10c4 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/1809693002
Diffstat (limited to 'tests/ImageTest.cpp')
-rw-r--r--tests/ImageTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index da9268dded..27e2e793fa 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -164,7 +164,7 @@ static void test_encode(skiatest::Reporter* reporter, SkImage* image) {
assert_equal(reporter, image, nullptr, decoded);
// Now see if we can instantiate an image from a subset of the surface/origEncoded
-
+
decoded.reset(SkImage::NewFromEncoded(origEncoded, &ir));
REPORTER_ASSERT(reporter, decoded);
assert_equal(reporter, image, &ir, decoded);
@@ -878,7 +878,7 @@ DEF_GPUTEST_FOR_NATIVE_CONTEXT(DeferredTextureImage, reporter, context, glContex
for (auto budgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) {
SkAutoTUnref<SkImage> newImage(
SkImage::NewFromDeferredTextureImageData(context, buffer, budgeted));
- REPORTER_ASSERT(reporter, newImage != nullptr);
+ REPORTER_ASSERT(reporter, SkToBool(newImage));
if (newImage) {
check_images_same(reporter, image, newImage);
}