Small improvements to SkBitSet:

src/utils/SkBitSet.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitSet.h"
 
 SkBitSet::SkBitSet(int numberOfBits)
     : fBitData(NULL), fDwordCount(0), fBitCount(numberOfBits) {
     SkASSERT(numberOfBits > 0);
     // Round up size to 32-bit boundary.
     fDwordCount = (numberOfBits + 31) / 32;
-    fBitData.set(malloc(fDwordCount * sizeof(uint32_t)));
-    clearAll();
+    fBitData.set(sk_calloc_throw(fDwordCount * sizeof(uint32_t)));
 }
 
 SkBitSet::SkBitSet(const SkBitSet& source)
     : fBitData(NULL), fDwordCount(0), fBitCount(0) {
     *this = source;
 }
 
 SkBitSet& SkBitSet::operator=(const SkBitSet& rhs) {
     if (this == &rhs) {
         return *this;
     }
     fBitCount = rhs.fBitCount;
     fBitData.free();
     fDwordCount = rhs.fDwordCount;
-    fBitData.set(malloc(fDwordCount * sizeof(uint32_t)));
+    fBitData.set(sk_malloc_throw(fDwordCount * sizeof(uint32_t)));
     memcpy(fBitData.get(), rhs.fBitData.get(), fDwordCount * sizeof(uint32_t));
     return *this;
 }
 
 bool SkBitSet::operator==(const SkBitSet& rhs) {
     if (fBitCount == rhs.fBitCount) {
         if (fBitData.get() != NULL) {
             return (memcmp(fBitData.get(), rhs.fBitData.get(),
                            fDwordCount * sizeof(uint32_t)) == 0);
         }
         return true;
     }
     return false;
 }
 
 bool SkBitSet::operator!=(const SkBitSet& rhs) {
     return !(*this == rhs);
 }
 
 void SkBitSet::clearAll() {
     if (fBitData.get() != NULL) {
         sk_bzero(fBitData.get(), fDwordCount * sizeof(uint32_t));
     }
 }
 
-void SkBitSet::setBit(int index, bool value) {
-    uint32_t mask = 1 << (index % 32);
-    if (value) {
-        *(internalGet(index)) |= mask;
-    } else {
-        *(internalGet(index)) &= ~mask;
-    }
-}
-
-bool SkBitSet::isBitSet(int index) const {
-    uint32_t mask = 1 << (index % 32);
-    return 0 != (*internalGet(index) & mask);
-}
-
 bool SkBitSet::orBits(const SkBitSet& source) {
     if (fBitCount != source.fBitCount) {
         return false;
     }
-    uint32_t* targetBitmap = internalGet(0);
+    uint32_t* targetBitmap = this->internalGet(0);
     uint32_t* sourceBitmap = source.internalGet(0);
     for (size_t i = 0; i < fDwordCount; ++i) {
         targetBitmap[i] |= sourceBitmap[i];
     }
     return true;
 }