diff options
author | Mike Klein <mtklein@google.com> | 2014-07-09 09:04:07 -0400 |
---|---|---|
committer | Mike Klein <mtklein@google.com> | 2014-07-09 09:04:07 -0400 |
commit | 874a62acef5ec2ecccdbb99ec4d86402a3341e6a (patch) | |
tree | 984dbc899480cb2dcaa578c08594266f2f9500cb /tests | |
parent | 0b544ae222aab1c5d9122a8dfe2800451b31d979 (diff) |
Revert "Remove ability for Release code to call getRefCnt() or getWeakRefCnt()."
This reverts commit 4ae94ffce5ecf1b71cb5e295b68bf4ec9e697443.
BUG=skia:
Review URL: https://codereview.chromium.org/382523002
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ClipCacheTest.cpp | 11 | ||||
-rw-r--r-- | tests/ImageFilterTest.cpp | 2 | ||||
-rw-r--r-- | tests/MetaDataTest.cpp | 11 | ||||
-rw-r--r-- | tests/RefCntTest.cpp | 11 | ||||
-rw-r--r-- | tests/RefDictTest.cpp | 31 | ||||
-rw-r--r-- | tests/SurfaceTest.cpp | 7 | ||||
-rw-r--r-- | tests/UtilsTest.cpp | 51 |
7 files changed, 59 insertions, 65 deletions
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp index c6f33c7eed..77f0137d5a 100644 --- a/tests/ClipCacheTest.cpp +++ b/tests/ClipCacheTest.cpp @@ -6,7 +6,6 @@ */ #include "Test.h" -#include "RefCntIs.h" // This is a GR test #if SK_SUPPORT_GPU #include "../../src/gpu/GrClipMaskManager.h" @@ -165,14 +164,14 @@ static void test_cache(skiatest::Reporter* reporter, GrContext* context) { // check that the set took check_state(reporter, cache, clip1, texture1, bound1); - REPORTER_ASSERT(reporter, !RefCntIs(*texture1, 0)); + REPORTER_ASSERT(reporter, texture1->getRefCnt()); // push the state cache.push(); // verify that the pushed state is initially empty check_empty_state(reporter, cache); - REPORTER_ASSERT(reporter, !RefCntIs(*texture1, 0)); + REPORTER_ASSERT(reporter, texture1->getRefCnt()); // modify the new state SkIRect bound2; @@ -190,8 +189,8 @@ static void test_cache(skiatest::Reporter* reporter, GrContext* context) { // check that the changes took check_state(reporter, cache, clip2, texture2, bound2); - REPORTER_ASSERT(reporter, !RefCntIs(*texture1, 0)); - REPORTER_ASSERT(reporter, !RefCntIs(*texture2, 0)); + REPORTER_ASSERT(reporter, texture1->getRefCnt()); + REPORTER_ASSERT(reporter, texture2->getRefCnt()); // check to make sure canReuse works REPORTER_ASSERT(reporter, cache.canReuse(clip2.getTopmostGenID(), bound2)); @@ -202,7 +201,7 @@ static void test_cache(skiatest::Reporter* reporter, GrContext* context) { // verify that the old state is restored check_state(reporter, cache, clip1, texture1, bound1); - REPORTER_ASSERT(reporter, !RefCntIs(*texture1, 0)); + REPORTER_ASSERT(reporter, texture1->getRefCnt()); // manually clear the state cache.reset(); diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 20899f4ee9..32822087ba 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -262,7 +262,7 @@ static void test_crop_rects(SkBaseDevice* device, skiatest::Reporter* reporter) SkIPoint offset; SkString str; str.printf("filter %d", static_cast<int>(i)); - SkAutoTUnref<SkImageFilter::Cache> cache(SkImageFilter::Cache::Create()); + SkAutoTUnref<SkImageFilter::Cache> cache(SkImageFilter::Cache::Create(2)); SkImageFilter::Context ctx(SkMatrix::I(), SkIRect::MakeLargest(), cache.get()); REPORTER_ASSERT_MESSAGE(reporter, filter->filterImage(&proxy, bitmap, ctx, &result, &offset), str.c_str()); diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp index 293e12a64d..eb7eae9e0f 100644 --- a/tests/MetaDataTest.cpp +++ b/tests/MetaDataTest.cpp @@ -6,12 +6,11 @@ */ #include "SkMetaData.h" -#include "RefCntIs.h" #include "Test.h" static void test_ptrs(skiatest::Reporter* reporter) { SkRefCnt ref; - REPORTER_ASSERT(reporter, RefCntIs(ref, 1)); + REPORTER_ASSERT(reporter, 1 == ref.getRefCnt()); { SkMetaData md0, md1; @@ -20,19 +19,19 @@ static void test_ptrs(skiatest::Reporter* reporter) { md0.setRefCnt(name, &ref); REPORTER_ASSERT(reporter, md0.findRefCnt(name)); REPORTER_ASSERT(reporter, md0.hasRefCnt(name, &ref)); - REPORTER_ASSERT(reporter, RefCntIs(ref, 2)); + REPORTER_ASSERT(reporter, 2 == ref.getRefCnt()); md1 = md0; REPORTER_ASSERT(reporter, md1.findRefCnt(name)); REPORTER_ASSERT(reporter, md1.hasRefCnt(name, &ref)); - REPORTER_ASSERT(reporter, RefCntIs(ref, 3)); + REPORTER_ASSERT(reporter, 3 == ref.getRefCnt()); REPORTER_ASSERT(reporter, md0.removeRefCnt(name)); REPORTER_ASSERT(reporter, !md0.findRefCnt(name)); REPORTER_ASSERT(reporter, !md0.hasRefCnt(name, &ref)); - REPORTER_ASSERT(reporter, RefCntIs(ref, 2)); + REPORTER_ASSERT(reporter, 2 == ref.getRefCnt()); } - REPORTER_ASSERT(reporter, RefCntIs(ref, 1)); + REPORTER_ASSERT(reporter, 1 == ref.getRefCnt()); } DEF_TEST(MetaData, reporter) { diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp index 5f2cbe466f..bd4f348fba 100644 --- a/tests/RefCntTest.cpp +++ b/tests/RefCntTest.cpp @@ -10,7 +10,6 @@ #include "SkThreadUtils.h" #include "SkTypes.h" #include "SkWeakRefCnt.h" -#include "RefCntIs.h" #include "Test.h" class InstCounterClass { @@ -34,7 +33,7 @@ static void test_refarray(skiatest::Reporter* reporter) { const int N = 10; SkTRefArray<InstCounterClass>* array = SkTRefArray<InstCounterClass>::Create(N); - REPORTER_ASSERT(reporter, RefCntIs(*array, 1)); + REPORTER_ASSERT(reporter, 1 == array->getRefCnt()); REPORTER_ASSERT(reporter, N == array->count()); REPORTER_ASSERT(reporter, N == InstCounterClass::gInstCounter); @@ -51,7 +50,7 @@ static void test_refarray(skiatest::Reporter* reporter) { } array = SkTRefArray<InstCounterClass>::Create(src, N); - REPORTER_ASSERT(reporter, RefCntIs(*array, 1)); + REPORTER_ASSERT(reporter, 1 == array->getRefCnt()); REPORTER_ASSERT(reporter, N == array->count()); REPORTER_ASSERT(reporter, 2*N == InstCounterClass::gInstCounter); @@ -92,7 +91,7 @@ static void test_refCnt(skiatest::Reporter* reporter) { thing1.join(); thing2.join(); - REPORTER_ASSERT(reporter, RefCntIs(*ref, 1)); + REPORTER_ASSERT(reporter, ref->getRefCnt() == 1); ref->unref(); } @@ -136,8 +135,8 @@ static void test_weakRefCnt(skiatest::Reporter* reporter) { thing3.join(); thing4.join(); - REPORTER_ASSERT(reporter, RefCntIs(*ref, 1)); - REPORTER_ASSERT(reporter, WeakRefCntIs(*ref, 1)); + REPORTER_ASSERT(reporter, ref->getRefCnt() == 1); + REPORTER_ASSERT(reporter, ref->getWeakCnt() == 1); ref->unref(); } diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp index 5b9987e29a..1e18a6815d 100644 --- a/tests/RefDictTest.cpp +++ b/tests/RefDictTest.cpp @@ -6,7 +6,6 @@ */ #include "SkRefDict.h" -#include "RefCntIs.h" #include "Test.h" class TestRC : public SkRefCnt { @@ -26,50 +25,50 @@ DEF_TEST(RefDict, reporter) { dict.set("foo", &data0); REPORTER_ASSERT(reporter, &data0 == dict.find("foo")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 2)); + REPORTER_ASSERT(reporter, 2 == data0.getRefCnt()); dict.set("foo", &data0); REPORTER_ASSERT(reporter, &data0 == dict.find("foo")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 2)); + REPORTER_ASSERT(reporter, 2 == data0.getRefCnt()); dict.set("foo", &data1); REPORTER_ASSERT(reporter, &data1 == dict.find("foo")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(data1, 2)); + REPORTER_ASSERT(reporter, 1 == data0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == data1.getRefCnt()); dict.set("foo", NULL); REPORTER_ASSERT(reporter, NULL == dict.find("foo")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(data1, 1)); + REPORTER_ASSERT(reporter, 1 == data0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == data1.getRefCnt()); dict.set("foo", &data0); dict.set("bar", &data1); REPORTER_ASSERT(reporter, &data0 == dict.find("foo")); REPORTER_ASSERT(reporter, &data1 == dict.find("bar")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(data1, 2)); + REPORTER_ASSERT(reporter, 2 == data0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == data1.getRefCnt()); dict.set("foo", &data1); REPORTER_ASSERT(reporter, &data1 == dict.find("foo")); REPORTER_ASSERT(reporter, &data1 == dict.find("bar")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(data1, 3)); + REPORTER_ASSERT(reporter, 1 == data0.getRefCnt()); + REPORTER_ASSERT(reporter, 3 == data1.getRefCnt()); dict.removeAll(); REPORTER_ASSERT(reporter, NULL == dict.find("foo")); REPORTER_ASSERT(reporter, NULL == dict.find("bar")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(data1, 1)); + REPORTER_ASSERT(reporter, 1 == data0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == data1.getRefCnt()); { SkRefDict d; REPORTER_ASSERT(reporter, NULL == d.find("foo")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 1)); + REPORTER_ASSERT(reporter, 1 == data0.getRefCnt()); d.set("foo", &data0); REPORTER_ASSERT(reporter, &data0 == d.find("foo")); - REPORTER_ASSERT(reporter, RefCntIs(data0, 2)); + REPORTER_ASSERT(reporter, 2 == data0.getRefCnt()); // let d go out of scope still with a ref on data0 } // be sure d's destructor lowered data0's owner count back to 1 - REPORTER_ASSERT(reporter, RefCntIs(data0, 1)); + REPORTER_ASSERT(reporter, 1 == data0.getRefCnt()); } diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 93ba3c2b9e..610e3370f6 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -11,7 +11,6 @@ #include "SkRRect.h" #include "SkSurface.h" #include "SkUtils.h" -#include "RefCntIs.h" #include "Test.h" #if SK_SUPPORT_GPU @@ -78,11 +77,11 @@ static void test_image(skiatest::Reporter* reporter) { void* addr = sk_malloc_throw(size); SkData* data = SkData::NewFromMalloc(addr, size); - REPORTER_ASSERT(reporter, RefCntIs(*data, 1)); + REPORTER_ASSERT(reporter, 1 == data->getRefCnt()); SkImage* image = SkImage::NewRasterData(info, data, rowBytes); - REPORTER_ASSERT(reporter, RefCntIs(*data, 2)); + REPORTER_ASSERT(reporter, 2 == data->getRefCnt()); image->unref(); - REPORTER_ASSERT(reporter, RefCntIs(*data, 1)); + REPORTER_ASSERT(reporter, 1 == data->getRefCnt()); data->unref(); } diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp index 9454b54e5c..438a5cce47 100644 --- a/tests/UtilsTest.cpp +++ b/tests/UtilsTest.cpp @@ -10,7 +10,6 @@ #include "SkTSearch.h" #include "SkTSort.h" #include "SkUtils.h" -#include "RefCntIs.h" #include "Test.h" class RefClass : public SkRefCnt { @@ -28,30 +27,30 @@ private: static void test_autounref(skiatest::Reporter* reporter) { RefClass obj(0); - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); SkAutoTUnref<RefClass> tmp(&obj); REPORTER_ASSERT(reporter, &obj == tmp.get()); - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); REPORTER_ASSERT(reporter, &obj == tmp.detach()); - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); REPORTER_ASSERT(reporter, NULL == tmp.detach()); REPORTER_ASSERT(reporter, NULL == tmp.get()); obj.ref(); - REPORTER_ASSERT(reporter, RefCntIs(obj, 2)); + REPORTER_ASSERT(reporter, 2 == obj.getRefCnt()); { SkAutoTUnref<RefClass> tmp2(&obj); } - REPORTER_ASSERT(reporter, RefCntIs(obj, 1)); + REPORTER_ASSERT(reporter, 1 == obj.getRefCnt()); } static void test_autostarray(skiatest::Reporter* reporter) { RefClass obj0(0); RefClass obj1(1); - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); { SkAutoSTArray<2, SkRefPtr<RefClass> > tmp; @@ -62,14 +61,14 @@ static void test_autostarray(skiatest::Reporter* reporter) { REPORTER_ASSERT(reporter, 4 == tmp.count()); tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); // test out reset with data in the array (and a new allocation) tmp.reset(0); REPORTER_ASSERT(reporter, 0 == tmp.count()); - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); tmp.reset(2); // this should use the preexisting allocation REPORTER_ASSERT(reporter, 2 == tmp.count()); @@ -78,8 +77,8 @@ static void test_autostarray(skiatest::Reporter* reporter) { } // test out destructor with data in the array (and using existing allocation) - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); { // test out allocating ctor (this should allocate new memory) @@ -88,32 +87,32 @@ static void test_autostarray(skiatest::Reporter* reporter) { tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); // Test out resut with data in the array and malloced storage tmp.reset(0); - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); tmp.reset(2); // this should use the preexisting storage tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); tmp.reset(4); // this should force a new malloc - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); tmp[0] = &obj0; tmp[1] = &obj1; - REPORTER_ASSERT(reporter, RefCntIs(obj0, 2)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 2)); + REPORTER_ASSERT(reporter, 2 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 2 == obj1.getRefCnt()); } - REPORTER_ASSERT(reporter, RefCntIs(obj0, 1)); - REPORTER_ASSERT(reporter, RefCntIs(obj1, 1)); + REPORTER_ASSERT(reporter, 1 == obj0.getRefCnt()); + REPORTER_ASSERT(reporter, 1 == obj1.getRefCnt()); } ///////////////////////////////////////////////////////////////////////////// |