Revert "Revert "change SkColorTable to be immutable""

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 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 "SkBitmap.h"
@@ skipping 518 matching lines @@
         case kNo_Config:
             return true;
 
         case kA1_Config:
         case kA8_Config:
         case kARGB_4444_Config:
         case kARGB_8888_Config:
             return (fFlags & kImageIsOpaque_Flag) != 0;
 
         case kIndex8_Config: {
-            uint32_t flags = 0;
+            bool isOpaque;
 
             this->lockPixels();
-            // if lockPixels failed, we may not have a ctable ptr
-            if (fColorTable) {
-                flags = fColorTable->getFlags();
-            }
+            isOpaque = fColorTable && fColorTable->isOpaque();
             this->unlockPixels();
-
-            return (flags & SkColorTable::kColorsAreOpaque_Flag) != 0;
+            return isOpaque;
         }
 
         case kRGB_565_Config:
             return true;
 
         default:
             SkDEBUGFAIL("unknown bitmap config pased to isOpaque");
             return false;
     }
 }
@@ skipping 928 matching lines @@
         if (ct) {
             const SkPMColor* SK_RESTRICT table = ct->lockColors();
             const uint8_t* SK_RESTRICT s = src.getAddr8(0, 0);
             while (--h >= 0) {
                 for (int x = 0; x < w; x++) {
                     alpha[x] = SkGetPackedA32(table[s[x]]);
                 }
                 s += rb;
                 alpha += alphaRowBytes;
             }
-            ct->unlockColors(false);
+            ct->unlockColors();
         }
     } else {    // src is opaque, so just fill alpha[] with 0xFF
         memset(alpha, 0xFF, h * alphaRowBytes);
     }
     return true;
 }
 
 #include "SkPaint.h"
 #include "SkMaskFilter.h"
 #include "SkMatrix.h"
@@ skipping 191 matching lines @@
         if (NULL != uri) {
             str->appendf(" uri:\"%s\"", uri);
         } else {
             str->appendf(" pixelref:%p", pr);
         }
     }
 
     str->append(")");
 }
 #endif