Add MultiPictureDraw to nanobench

include/core/SkColorTable.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkColorTable_DEFINED
@@ skipping 28 matching lines @@
     SkPMColor operator[](int index) const {
         SkASSERT(fColors != NULL && (unsigned)index < (unsigned)fCount);
         return fColors[index];
     }
 
     /**
      *  Return the array of colors for reading. This must be balanced by a call
      *  to unlockColors().
      */
     const SkPMColor* lockColors() {
         SkDEBUGCODE(sk_atomic_inc(&fColorLockCount);)

[mtklein, 2014/11/20 14:21:47]

It's funny we inline lockColors() and unlock16BitCache(), but outline
unlockColors() and lock16BitCache().

:)

Sort of seems we should drop the lock() and unlock() methods here if we're only
doing anything in debug mode.  What's the point of the extra burden to call them
if we don't really require it?

         return fColors;
     }
 
     /**
      *  Balancing call to lockColors().
      */
     void unlockColors();
 
     /** Similar to lockColors(), lock16BitCache() returns the array of
         RGB16 colors that mirror the 32bit colors. However, this function
         will return null if kColorsAreOpaque_Flag is not set.
         Also, unlike lockColors(), the returned array here cannot be modified.
     */
     const uint16_t* lock16BitCache();
     /** Balancing call to lock16BitCache().
     */
     void unlock16BitCache() {
         SkASSERT(f16BitCacheLockCount > 0);
-        SkDEBUGCODE(f16BitCacheLockCount -= 1);
+        SkDEBUGCODE(sk_atomic_dec(&f16BitCacheLockCount);)
     }
 
     explicit SkColorTable(SkReadBuffer&);
     void writeToBuffer(SkWriteBuffer&) const;
 
 private:
     SkPMColor*  fColors;
     uint16_t*   f16BitCache;
     int         fCount;
     SkDEBUGCODE(int fColorLockCount;)
     SkDEBUGCODE(int f16BitCacheLockCount;)
 
     void init(const SkPMColor* colors, int count);
 
     void inval16BitCache();
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif