Revert of Add MultiPictureDraw to nanobench

src/core/SkColorTable.cpp

 
 /*
  * Copyright 2009 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkColorTable.h"
@@ skipping 52 matching lines @@
         *dst++ = SkPixel32ToPixel16_ToU16(*src++);
     }
 }
 
 const uint16_t* SkColorTable::lock16BitCache() {
     if (NULL == f16BitCache) {
         f16BitCache = (uint16_t*)sk_malloc_throw(fCount * sizeof(uint16_t));
         build_16bitcache(f16BitCache, fColors, fCount);
     }
 
-    SkDEBUGCODE(sk_atomic_inc(&f16BitCacheLockCount));
+    SkDEBUGCODE(f16BitCacheLockCount += 1);
     return f16BitCache;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkColorTable::SkColorTable(SkReadBuffer& buffer) {
     f16BitCache = NULL;
     SkDEBUGCODE(fColorLockCount = 0;)
     SkDEBUGCODE(f16BitCacheLockCount = 0;)
 
@@ skipping 13 matching lines @@
     }
 #ifdef SK_DEBUG
     SkASSERT((unsigned)fCount <= 256);
     SkASSERT(success);
 #endif
 }
 
 void SkColorTable::writeToBuffer(SkWriteBuffer& buffer) const {
     buffer.writeColorArray(fColors, fCount);
 }