replace SkBitmap::Config with SkColorType in gms

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
 #define SkBitmap_DEFINED
 
 #include "SkColor.h"
 #include "SkColorTable.h"
 #include "SkImageInfo.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
 
+struct SkMask;
 struct SkIRect;
 struct SkRect;
 class SkPaint;
 class SkPixelRef;
 class SkPixelRefFactory;
 class SkRegion;
 class SkString;
 
 class GrTexture;
 
@@ skipping 273 matching lines @@
     /**
      *  Install a pixelref that wraps the specified pixels and rowBytes, and
      *  optional ReleaseProc and context. When the pixels are no longer
      *  referenced, if ReleaseProc is not null, it will be called with the
      *  pixels and context as parameters.
      *  On failure, the bitmap will be set to empty and return false.
      */
     bool installPixels(const SkImageInfo&, void* pixels, size_t rowBytes,
                        void (*ReleaseProc)(void* addr, void* context),
                        void* context);
+    
+    /**
+     *  Call installPixels with no ReleaseProc specified. This means that the
+     *  caller must ensure that the specified pixels are valid for the lifetime
+     *  of the created bitmap (and its pixelRef).
+     */
+    bool installPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {
+        return this->installPixels(info, pixels, rowBytes, NULL, NULL);
+    }
+
+    /**
+     *  Calls installPixels() with the value in the SkMask. The caller must
+     *  ensure that the specified mask pixels are valid for the lifetime
+     *  of the created bitmap (and its pixelRef).

[hal.canary, 2014/02/17 20:11:31]

I'm always afraid of these assumptions that the mask pixels will remain valid. 
What if the bitmap gets copied accidentally?  Why not allocate an A8 SkBitmap
and then have a function that makes a mask out of that?

bool SkBitmap::getMask(SkMask* mask) {
  if (this->colorType() != kAlpha_8_SkColorType)
    return false;
  if (!this->getPixels()) // must lock bitmap first.
    return false;
  if (mask) {
    mask->fImage = (uint8_t*)(this->getPixels());
    mask->fBounds = SkIRect::MakeWH(this->width(), this->height());
    mask->fRowBytes = this->rowBytes;
    mask->fFormat = Skmask::kA8_Format;
  }
  return true
}

+     */
+    bool installMaskPixels(const SkMask&);
 
     /**
      *  DEPRECATED: call info().
      */
     bool asImageInfo(SkImageInfo* info) const {
         // compatibility: return false for kUnknown
         if (kUnknown_SkColorType == this->colorType()) {
             return false;
         }
         if (info) {
@@ skipping 578 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Helpers until we can fully deprecate SkBitmap::Config
 //
 extern SkBitmap::Config SkColorTypeToBitmapConfig(SkColorType);
 extern SkColorType SkBitmapConfigToColorType(SkBitmap::Config);
 
 #endif