Revert "change SkColorTable to be immutable"

include/core/SkBitmap.h

 
 /*
  * Copyright 2006 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.
  */
 
 
 #ifndef SkBitmap_DEFINED
@@ skipping 730 matching lines @@
         fColors = fCTable ? fCTable->lockColors() : NULL;
     }
     /** Initialize with a colortable (may be null)
      */
     explicit SkAutoLockColors(SkColorTable* ctable) {
         fCTable = ctable;
         fColors = ctable ? ctable->lockColors() : NULL;
     }
     ~SkAutoLockColors() {
         if (fCTable) {
-            fCTable->unlockColors();
+            fCTable->unlockColors(false);
         }
     }
 
     /** Return the currently locked colors, or NULL if no bitmap's colortable
         is currently locked.
     */
     const SkPMColor* colors() const { return fColors; }
 
     /** Locks the table and returns is colors (assuming ctable is not null) and
         unlocks the previous table if one was present
      */
     const SkPMColor* lockColors(SkColorTable* ctable) {
         if (fCTable) {
-            fCTable->unlockColors();
+            fCTable->unlockColors(false);
         }
         fCTable = ctable;
         fColors = ctable ? ctable->lockColors() : NULL;
         return fColors;
     }
 
     const SkPMColor* lockColors(const SkBitmap& bm) {
         return this->lockColors(bm.getColorTable());
     }
 
@@ skipping 35 matching lines @@
 
 // returns the address of the byte that contains the x coordinate
 inline uint8_t* SkBitmap::getAddr1(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(fConfig == kA1_Config);
     SkASSERT((unsigned)x < fWidth && (unsigned)y < fHeight);
     return (uint8_t*)fPixels + y * fRowBytes + (x >> 3);
 }
 
 #endif