SkColorTable locking serves no purpose anymore.

src/opts/SkBitmapProcState_opts_mips_dsp.cpp

 /*
  * Copyright 2014 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 "SkBitmapProcState.h"
 #include "SkBitmapScaler.h"
 #include "SkColorPriv.h"
 #include "SkPaint.h"
 #include "SkUtils.h"
 
 static void SI8_D16_nofilter_DX_mips_dsp(const SkBitmapProcState& s,
                                          const uint32_t* SK_RESTRICT xy,
                                          int count, uint16_t* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
     SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
-    const uint16_t* SK_RESTRICT table = s.fBitmap->getColorTable()->lock16BitCache();
+    const uint16_t* SK_RESTRICT table = s.fBitmap->getColorTable()->read16BitCache();
     const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels();
     SkASSERT((unsigned)xy[0] < (unsigned)s.fBitmap->height());
     srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fBitmap->rowBytes());
     uint8_t src;
 
     if (1 == s.fBitmap->width()) {
         src = srcAddr[0];
         uint16_t dstValue = table[src];
         sk_memset16(colors, dstValue, count);
     } else {
@@ skipping 103 matching lines @@
             ".set    pop                                 \n\t"
             : [xx]"+r"(xx), [count8]"=&r"(count8), [colors]"+r"(colors)
             : [table]"r"(table), [srcAddr]"r"(srcAddr), [count]"r"(count)
             : "memory","t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7"
         );
 
         for (int i = (count & 7); i > 0; --i) {
             src = srcAddr[*xx++]; *colors++ = table[src];
         }
     }
-    s.fBitmap->getColorTable()->unlock16BitCache();
 }
 
 static void SI8_opaque_D32_nofilter_DX_mips_dsp(const SkBitmapProcState& s,
                                                 const uint32_t* SK_RESTRICT xy,
                                                 int count, SkPMColor* SK_RESTRICT colors) {
     SkASSERT(count > 0 && colors != NULL);
     SkASSERT(s.fInvType <= (SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask));
     SkASSERT(SkPaint::kNone_FilterLevel == s.fFilterLevel);
-    const SkPMColor* SK_RESTRICT table = s.fBitmap->getColorTable()->lockColors();
+    const SkPMColor* SK_RESTRICT table = s.fBitmap->getColorTable()->readColors();
     const uint8_t* SK_RESTRICT srcAddr = (const uint8_t*)s.fBitmap->getPixels();
     srcAddr = (const uint8_t*)((const char*)srcAddr + xy[0] * s.fBitmap->rowBytes());
 
     if (1 == s.fBitmap->width()) {
         uint8_t src = srcAddr[0];
         SkPMColor dstValue = table[src];
         sk_memset32(colors, dstValue, count);
     } else {
         const uint16_t* xx = (const uint16_t*)(xy + 1);
         int s0, s1, s2, s3, s4, s5, s6, s7;
@@ skipping 191 matching lines @@
         "4:                                              \n\t"
             ".set    pop                                 \n\t"
             : [xx]"+r"(xx), [count]"+r"(count), [colors]"+r"(colors),
               [s0]"=&r"(s0), [s1]"=&r"(s1), [s2]"=&r"(s2), [s3]"=&r"(s3),
               [s4]"=&r"(s4), [s5]"=&r"(s5), [s6]"=&r"(s6), [s7]"=&r"(s7)
             : [table]"r"(table), [srcAddr]"r"(srcAddr)
             : "memory", "t0", "t1", "t2", "t3",
               "t4", "t5", "t6", "t7", "t8"
         );
     }
-    s.fBitmap->getColorTable()->unlockColors();
 }
 
 /*  If we replace a sampleproc, then we null-out the associated shaderproc,
     otherwise the shader won't even look at the matrix/sampler
  */
 
 void SkBitmapProcState::platformProcs() {
     bool isOpaque = 256 == fAlphaScale;
     bool justDx = false;
 
@@ skipping 11 matching lines @@
                     fShaderProc32 = NULL;
                 }
             }
             break;
         default:
             break;
     }
 }
 
 void SkBitmapScaler::PlatformConvolutionProcs(SkConvolutionProcs*) {}