AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove ability for Release code to call getRefCnt() or getWeakRefCnt().

Browse Source 
These getRefCnt() methods are not thread safe, so Skia code should not
be calling them.  unique() is fine.

SkDEBUG code (SkASSERTs) can still call getRefCnt() / getWeakRefCnt().

This adds tools/RefCntIs.{h,cpp}, which lets tests make their assertions in
both debug and release modes.

BUG=skia:2726

Committed: https://skia.googlesource.com/skia/+/4ae94ffce5ecf1b71cb5e295b68bf4ec9e697443

R=senorblanco@chromium.org, mtklein@google.com, reed@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/378643003
This commit is contained in:
mtklein 2014-07-09 07:52:32 -07:00 committed by Commit bot
parent ecce60bad6
commit bd7746da97
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/core/SkImageFilter.h
View File

@ -51,6 +51,7 @@ public:
class SK_API Cache : public SkRefCnt {
public:
// By default, we cache only image filters with 2 or more children.
// Values less than 2 mean always cache; values greater than 2 are not supported.
static Cache* Create(int minChildren = 2);
virtual ~Cache() {}
virtual bool get(const SkImageFilter* key, SkBitmap* result, SkIPoint* offset) = 0;

10
src/core/SkImageFilter.cpp
View File

@ -361,7 +361,10 @@ static uint32_t compute_hash(const uint32_t* data, int count) {
class CacheImpl : public SkImageFilter::Cache {
public:
explicit CacheImpl(int minChildren) : fMinChildren(minChildren) {}
explicit CacheImpl(int minChildren) : fMinChildren(minChildren) {
SkASSERT(fMinChildren <= 2);
}
virtual ~CacheImpl();
bool get(const SkImageFilter* key, SkBitmap* result, SkIPoint* offset) SK_OVERRIDE;
void set(const SkImageFilter* key, const SkBitmap& result, const SkIPoint& offset) SK_OVERRIDE;
@ -404,7 +407,10 @@ void CacheImpl::remove(const SkImageFilter* key) {
}
void CacheImpl::set(const SkImageFilter* key, const SkBitmap& result, const SkIPoint& offset) {
if (key->getRefCnt() >= fMinChildren) {
if (fMinChildren < 2 || !key->unique()) {
// We take !key->unique() as a signal that there are probably at least 2 refs on the key,
// meaning this filter probably has at least two children and is worth caching when
// fMinChildren is 2. If fMinChildren is less than two, we'll just always cache.
fData.add(new Value(key, result, offset));
}
}

3
tools/tsan.supp
View File

@ -25,6 +25,3 @@ race:is_lcd_supported
race:RefFCI
race:SkString
race:SkPDF
# This calls SkRefCnt::getRefCnt(), which is not thread safe. skia:2726
race:SkImageFilter::filterImage