From 874a62acef5ec2ecccdbb99ec4d86402a3341e6a Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 9 Jul 2014 09:04:07 -0400 Subject: Revert "Remove ability for Release code to call getRefCnt() or getWeakRefCnt()." This reverts commit 4ae94ffce5ecf1b71cb5e295b68bf4ec9e697443. BUG=skia: Review URL: https://codereview.chromium.org/382523002 --- tests/MetaDataTest.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/MetaDataTest.cpp') 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) { -- cgit v1.2.3