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/MetaDataTest.cpp | |
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/MetaDataTest.cpp')
-rw-r--r-- | tests/MetaDataTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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) { |