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
Review URL: https://codereview.chromium.org/1780933003
diff --git a/tests/CPlusPlusEleven.cpp b/tests/CPlusPlusEleven.cpp
index 0cd2e93..5fbd464 100644
--- a/tests/CPlusPlusEleven.cpp
+++ b/tests/CPlusPlusEleven.cpp
@@ -28,72 +28,3 @@
Moveable src1; Moveable dst1(std::move(src1));
Moveable src2, dst2; dst2 = std::move(src2);
}
-
-#define TOO_BIG "The unique_ptr was bigger than expected."
-#define WEIRD_SIZE "The unique_ptr was a different size than expected."
-
-DEF_TEST(CPlusPlusEleven_UniquePtr, r) {
- struct SmallUniquePtr {
- Moveable* p;
- };
- struct BigUniquePtr {
- void(*d)(Moveable*);
- Moveable* p;
- };
-
- static_assert(sizeof(skstd::unique_ptr<Moveable>) == sizeof(SmallUniquePtr), TOO_BIG);
- static_assert(sizeof(skstd::unique_ptr<Moveable[]>) == sizeof(SmallUniquePtr), TOO_BIG);
-
- using proc = void(*)(Moveable*);
- static_assert(sizeof(skstd::unique_ptr<Moveable, proc>) == sizeof(BigUniquePtr), WEIRD_SIZE);
- static_assert(sizeof(skstd::unique_ptr<Moveable[], proc>) == sizeof(BigUniquePtr), WEIRD_SIZE);
-
- {
- skstd::unique_ptr<Moveable, void(*)(Moveable*)> u(nullptr, deleter<Moveable>);
- static_assert(sizeof(u) == sizeof(BigUniquePtr), WEIRD_SIZE);
-
- auto u2 = std::move(u);
- static_assert(sizeof(u2) == sizeof(BigUniquePtr), WEIRD_SIZE);
- }
-
- {
- skstd::unique_ptr<Moveable, void(*)(Moveable*)> u(nullptr, [](Moveable* m){ deleter(m); });
- static_assert(sizeof(u) == sizeof(BigUniquePtr), WEIRD_SIZE);
-
- auto u2 = std::move(u);
- static_assert(sizeof(u2) == sizeof(BigUniquePtr), WEIRD_SIZE);
- }
-
- {
- auto d = [](Moveable* m){ deleter(m); };
- skstd::unique_ptr<Moveable, decltype(d)> u(nullptr, d);
- static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
-
- auto u2 = std::move(u);
- static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
- }
-
- {
- skstd::unique_ptr<Moveable, Deleter<Moveable>> u(nullptr, Deleter<Moveable>());
- static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
-
- auto u2 = std::move(u);
- static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
- }
-
- {
- skstd::unique_ptr<Moveable, Deleter<Moveable>> u(new Moveable(), Deleter<Moveable>());
- static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
-
- auto u2 = std::move(u);
- static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
- }
-
- {
- skstd::unique_ptr<const void, Deleter<const void>> u(new Moveable(), Deleter<const void>());
- static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
-
- auto u2 = std::move(u);
- static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
- }
-}
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index df15208..25fcf85 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -62,7 +62,7 @@
GrRenderTarget* rt = (*rtKeepAlive)->asRenderTarget();
SkASSERT(rt->getUniqueID() != oldID);
dc->reset(context->drawContext(rt));
- return SkToBool(*dc);
+ return *dc != nullptr;
}
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ClearBatch, reporter, context) {
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 27e2e79..da9268d 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -164,7 +164,7 @@
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 @@
for (auto budgeted : { SkBudgeted::kNo, SkBudgeted::kYes }) {
SkAutoTUnref<SkImage> newImage(
SkImage::NewFromDeferredTextureImageData(context, buffer, budgeted));
- REPORTER_ASSERT(reporter, SkToBool(newImage));
+ REPORTER_ASSERT(reporter, newImage != nullptr);
if (newImage) {
check_images_same(reporter, image, newImage);
}
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 3654a77..3d2f19d 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1408,7 +1408,7 @@
SkAutoTDelete<SkStream> rstream(wstream.detachAsStream());
SkAutoTUnref<SkPicture> deserializedPicture(SkPicture::CreateFromStream(rstream));
- REPORTER_ASSERT(r, SkToBool(deserializedPicture));
+ REPORTER_ASSERT(r, deserializedPicture != nullptr);
REPORTER_ASSERT(r, deserializedPicture->cullRect().left() == 1);
REPORTER_ASSERT(r, deserializedPicture->cullRect().top() == 2);
REPORTER_ASSERT(r, deserializedPicture->cullRect().right() == 3);
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index c715b2e..784ae7e 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -136,7 +136,7 @@
resourceProvider->attachStencilAttachment(bigRT->asRenderTarget()));
if (context->caps()->maxSampleCount() >= 4) {
- // An RT with a different sample count should not share.
+ // An RT with a different sample count should not share.
GrSurfaceDesc smallMSAADesc = smallDesc;
smallMSAADesc.fSampleCnt = 4;
SkAutoTUnref<GrTexture> smallMSAART0(cache->createTexture(smallMSAADesc, SkBudgeted::kNo));
@@ -216,8 +216,8 @@
SkAutoTUnref<GrTexture> adopted(context->textureProvider()->wrapBackendTexture(
desc, kAdopt_GrWrapOwnership));
- REPORTER_ASSERT(reporter, SkToBool(borrowed) && SkToBool(adopted));
- if (!SkToBool(borrowed) || !SkToBool(adopted)) {
+ REPORTER_ASSERT(reporter, borrowed != nullptr && adopted != nullptr);
+ if (!borrowed || !adopted) {
return;
}
@@ -242,7 +242,7 @@
enum ScratchConstructor { kScratchConstructor };
public:
static const size_t kDefaultSize = 100;
-
+
/** Property that distinctly categorizes the resource.
* For example, textures have width, height, ... */
enum SimulatedProperty { kA_SimulatedProperty, kB_SimulatedProperty };
@@ -590,7 +590,7 @@
REPORTER_ASSERT(reporter, SkBudgeted::kYes == resource->resourcePriv().isBudgeted());
if (0 == i) {
- // If made unbudgeted, it should return to original state: ref'ed and unbudgeted. Try
+ // If made unbudgeted, it should return to original state: ref'ed and unbudgeted. Try
// the above tests again.
resource->resourcePriv().makeUnbudgeted();
} else {
@@ -784,11 +784,11 @@
GrUniqueKey key;
make_unique_key<0>(&key, 0);
-
+
// Create two resources that we will attempt to register with the same unique key.
TestResource* a = new TestResource(context->getGpu());
a->setSize(11);
-
+
// Set key on resource a.
a->resourcePriv().setUniqueKey(key);
REPORTER_ASSERT(reporter, a == cache->findAndRefUniqueResource(key));
@@ -882,7 +882,7 @@
make_unique_key<0>(&key1, 1);
make_unique_key<0>(&key2, 2);
make_unique_key<0>(&key3, 3);
-
+
// Add three resources to the cache. Only c is usable as scratch.
TestResource* a = new TestResource(context->getGpu());
TestResource* b = new TestResource(context->getGpu());