summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-27 19:14:46 +0000
committercommit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-04-27 19:14:46 +0000
commitee285a41e56b90e52c9077ab57412dffc46fc872 (patch)
treeb63c564a8004f12ccc64261a53eb7ccc350eb2ca
parent04677cffe4d08dc51d1503116f2a0c8d7feac4bd (diff)
downloadinclude-ee285a41e56b90e52c9077ab57412dffc46fc872.tar.gz
Revert of teach TSAN about SkSpinlock, SkRefCnt, and SkOnce (https://codereview.chromium.org/247813005/)
Reason for revert: breaks blink in roll Original issue's description: > teach TSAN about SkSpinlock, SkRefCnt, and SkOnce > > BUG=skia: > > Committed: http://code.google.com/p/skia/source/detail?r=14353 > > NOTRY=true > NOTREECHECKS=true > > Committed: http://code.google.com/p/skia/source/detail?r=14354 R=bsalomon@google.com, bungeman@google.com, mtklein@chromium.org TBR=bsalomon@google.com, bungeman@google.com, mtklein@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Author: mtklein@google.com Review URL: https://codereview.chromium.org/258783005 git-svn-id: http://skia.googlecode.com/svn/trunk/include@14389 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--core/SkRefCnt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/SkRefCnt.h b/core/SkRefCnt.h
index 66ce066..2ac68dd 100644
--- a/core/SkRefCnt.h
+++ b/core/SkRefCnt.h
@@ -107,7 +107,7 @@ protected:
private:
// OK for use in asserts, but not much else.
- int32_t unsafeGetRefCnt() const { return SK_ANNOTATE_UNPROTECTED_READ(fRefCnt); }
+ int32_t unsafeGetRefCnt() { return SK_ANNOTATE_UNPROTECTED_READ(fRefCnt); }
/**
* Called when the ref count goes to 0.