Revert "Revert "PixelRef now returns (nearly) everything that is currently in SkBitmap. The goal is…

include/gpu/SkGr.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 32 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SkColorPriv.h"
 
 /**
  *  Convert the SkBitmap::Config to the corresponding PixelConfig, or
  *  kUnknown_PixelConfig if the conversion cannot be done.
  */
 GrPixelConfig SkBitmapConfig2GrPixelConfig(SkBitmap::Config);
+bool GrPixelConfig2ColorType(GrPixelConfig, SkColorType*);
 
 static inline GrColor SkColor2GrColor(SkColor c) {
     SkPMColor pm = SkPreMultiplyColor(c);
     unsigned r = SkGetPackedR32(pm);
     unsigned g = SkGetPackedG32(pm);
     unsigned b = SkGetPackedB32(pm);
     unsigned a = SkGetPackedA32(pm);
     return GrColorPackRGBA(r, g, b, a);
 }
 
@@ skipping 25 matching lines @@
 
 private:
     SkGlyphCache* fStrike;
     GrKey*  fKey;
 //    DECLARE_INSTANCE_COUNTER(SkGrFontScaler);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 
 #endif