SkColorTable locking serves no purpose anymore.

src/core/SkConfig8888.cpp

Index: src/core/SkConfig8888.cpp
diff --git a/src/core/SkConfig8888.cpp b/src/core/SkConfig8888.cpp
index b0572c0544c6a1eb15b4f01ee21c69813e6fceba..8b47a20633fa67bb95fdc6416f2f44faa9524160 100644
--- a/src/core/SkConfig8888.cpp
+++ b/src/core/SkConfig8888.cpp
@@ -154,13 +154,13 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
         dstPI.fAlphaType = dstInfo.alphaType();
         dstPI.fPixels = dstPixels;
         dstPI.fRowBytes = dstRB;
-        
+
         SkSrcPixelInfo srcPI;
         srcPI.fColorType = srcInfo.colorType();
         srcPI.fAlphaType = srcInfo.alphaType();
         srcPI.fPixels = srcPixels;
         srcPI.fRowBytes = srcRB;
-        
+
         return srcPI.convertPixelsTo(&dstPI, width, height);
     }
 
@@ -196,13 +196,13 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
             // Our method for converting to 4444 assumes premultiplied.
             return false;
         }
-        
+
         const SkPMColor* table = NULL;
         if (kIndex_8_SkColorType == srcInfo.colorType()) {
             if (NULL == ctable) {
                 return false;
             }
-            table = ctable->lockColors();
+            table = ctable->readColors();
         }
 
         for (int y = 0; y < height; ++y) {
@@ -222,10 +222,6 @@ bool SkPixelInfo::CopyPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t
             dstPixels = (char*)dstPixels + dstRB;
             srcPixels = (const char*)srcPixels + srcRB;
         }
-        
-        if (table) {
-            ctable->unlockColors();
-        }
         return true;
     }