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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/RefCntIs.cpp | 9 | ||||
| -rw-r--r-- | tools/RefCntIs.h | 13 | ||||
| -rw-r--r-- | tools/tsan.supp | 3 |
3 files changed, 3 insertions, 22 deletions
diff --git a/tools/RefCntIs.cpp b/tools/RefCntIs.cpp deleted file mode 100644 index 48154b045c..0000000000 --- a/tools/RefCntIs.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "RefCntIs.h" - -bool RefCntIs(const SkRefCntBase& obj, int32_t n) { - return obj.fRefCnt == n; -} - -bool WeakRefCntIs(const SkWeakRefCnt& obj, int32_t n) { - return obj.fWeakCnt == n; -} diff --git a/tools/RefCntIs.h b/tools/RefCntIs.h deleted file mode 100644 index 86d3cc3e12..0000000000 --- a/tools/RefCntIs.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef RefCntIs_DEFINED -#define RefCntIs_DEFINED - -// Allows tests to assert a particular value for a ref count, -// without letting Skia library code look at that value. - -#include "SkRefCnt.h" -#include "SkWeakRefCnt.h" - -bool RefCntIs(const SkRefCntBase&, int32_t); -bool WeakRefCntIs(const SkWeakRefCnt&, int32_t); - -#endif//RefCntIs_DEFINED diff --git a/tools/tsan.supp b/tools/tsan.supp index f687014040..8c95e7a9c5 100644 --- a/tools/tsan.supp +++ b/tools/tsan.supp @@ -25,3 +25,6 @@ race:is_lcd_supported race:RefFCI race:SkString race:SkPDF + +# This calls SkRefCnt::getRefCnt(), which is not thread safe. skia:2726 +race:SkImageFilter::filterImage |