commit 7c6d26420d80275bb92f6d9ed86190554b0a6c13
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 06 12:19:38 2013 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Aug 06 12:19:38 2013 +0000
tree cead15fc54739ef0fd99e721f13a556d17ea6a46
parent 078dcf2c50048d8e518488fdb127be78a1c7b921

Fix race condition when locking/unlocking pixels.

R=reed@google.com

Review URL: https://codereview.chromium.org/22235002

git-svn-id: http://skia.googlecode.com/svn/trunk@10556 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkBitmap.cpp

diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 2635e13..9a116df 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -340,7 +340,7 @@
 }
 
 void SkBitmap::lockPixels() const {
-    if (NULL != fPixelRef && 1 == ++fPixelLockCount) {
+    if (NULL != fPixelRef && 0 == sk_atomic_inc(&fPixelLockCount)) {
         fPixelRef->lockPixels();
         this->updatePixelsFromRef();
     }
@@ -350,7 +350,7 @@
 void SkBitmap::unlockPixels() const {
     SkASSERT(NULL == fPixelRef || fPixelLockCount > 0);
 
-    if (NULL != fPixelRef && 0 == --fPixelLockCount) {
+    if (NULL != fPixelRef && 1 == sk_atomic_dec(&fPixelLockCount)) {
         fPixelRef->unlockPixels();
         this->updatePixelsFromRef();
     }