remove alphatype from colortable

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
 #define SkColorTable_DEFINED
 
 #include "SkColor.h"
 #include "SkFlattenable.h"
 #include "SkImageInfo.h"
 
 /** \class SkColorTable
 
     SkColorTable holds an array SkPMColors (premultiplied 32-bit colors) used by
     8-bit bitmaps, where the bitmap bytes are interpreted as indices into the colortable.
 */
 class SK_API SkColorTable : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkColorTable)
 
     /** Makes a deep copy of colors.
      */
     SkColorTable(const SkColorTable& src);
-    SkColorTable(const SkPMColor colors[], int count,
-                 SkAlphaType alphaType = kPremul_SkAlphaType);
+    SkColorTable(const SkPMColor colors[], int count);
     virtual ~SkColorTable();
 
-    SkAlphaType alphaType() const { return (SkAlphaType)fAlphaType; }
-
-    bool isOpaque() const {
-        return SkAlphaTypeIsOpaque(this->alphaType());
-    }
-
     /** Returns the number of colors in the table.
     */
     int count() const { return fCount; }
 
     /** Returns the specified color from the table. In the debug build, this asserts that
         the index is in range (0 <= index < count).
     */
     SkPMColor operator[](int index) const {
-        SkASSERT(fColors != NULL && (unsigned)index < fCount);
+        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);)
         return fColors;
@@ skipping 16 matching lines @@
         SkASSERT(f16BitCacheLockCount > 0);
         SkDEBUGCODE(f16BitCacheLockCount -= 1);
     }
 
     explicit SkColorTable(SkReadBuffer&);
     void writeToBuffer(SkWriteBuffer&) const;
 
 private:
     SkPMColor*  fColors;
     uint16_t*   f16BitCache;
-    uint16_t    fCount;
-    uint8_t     fAlphaType;
+    int         fCount;
     SkDEBUGCODE(int fColorLockCount;)
     SkDEBUGCODE(int f16BitCacheLockCount;)
 
+    void init(const SkPMColor* colors, int count);
+
     void inval16BitCache();
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif