diff options
| author |  robertphillips <robertphillips@google.com> | 2014-11-21 05:50:21 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-21 05:50:21 -0800 |
| commit | e77dadd91ae6f4319c2c047e7e36cc79bb4d1eff (patch) | |
| tree | 53caf01479f56733a51197521047592b8ffdb762 /src | |
| parent | 0ddad31012dabfc1267effc8071d37f7d606efbe (diff) | |
Revert of Add MultiPictureDraw to nanobench (patchset #7 id:120001 of https://codereview.chromium.org/731973005/)
Reason for revert:
Needs more work
Original issue's description:
> Add MultiPictureDraw to nanobench
>
> I would like some guard against performance regressions on our side before turning layer hoisting on in Chromium.
>
> TBR=bsalomon@google.com
>
> Committed: https://skia.googlesource.com/skia/+/0ddad31012dabfc1267effc8071d37f7d606efbe
TBR=mtklein@google.com,bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/750583002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkBitmap.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkColorTable.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp index 836825db24..f0ad029bea 100644 --- a/src/core/SkBitmap.cpp +++ b/src/core/SkBitmap.cpp @@ -1323,6 +1323,7 @@ void SkBitmap::validate() const { if (fPixels) { SkASSERT(fPixelRef); + SkASSERT(fPixelLockCount > 0); SkASSERT(fPixelRef->isLocked()); SkASSERT(fPixelRef->rowBytes() == fRowBytes); SkASSERT(fPixelRefOrigin.fX >= 0); diff --git a/src/core/SkColorTable.cpp b/src/core/SkColorTable.cpp index 0d033ec2be..f2eab61483 100644 --- a/src/core/SkColorTable.cpp +++ b/src/core/SkColorTable.cpp @@ -70,7 +70,7 @@ const uint16_t* SkColorTable::lock16BitCache() { build_16bitcache(f16BitCache, fColors, fCount); } - SkDEBUGCODE(sk_atomic_inc(&f16BitCacheLockCount)); + SkDEBUGCODE(f16BitCacheLockCount += 1); return f16BitCache; } |