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

include/gpu/GrSurface.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 GrSurface_DEFINED
 #define GrSurface_DEFINED
 
 #include "GrTypes.h"
 #include "GrResource.h"
 #include "SkRect.h"
 
 class GrTexture;
 class GrRenderTarget;
+struct SkImageInfo;
 
 class GrSurface : public GrResource {
 public:
     SK_DECLARE_INST_COUNT(GrSurface);
 
     /**
      * Retrieves the width of the surface.
      *
      * @return the width in texels
      */
@@ skipping 23 matching lines @@
      * if client asked us to render to a target that has a pixel
      * config that isn't equivalent with one of our configs.
      */
     GrPixelConfig config() const { return fDesc.fConfig; }
 
     /**
      * Return the descriptor describing the surface
      */
     const GrTextureDesc& desc() const { return fDesc; }
 
+    void asImageInfo(SkImageInfo*) const;
+
     /**
      * @return the texture associated with the surface, may be NULL.
      */
     virtual GrTexture* asTexture() = 0;
     virtual const GrTexture* asTexture() const = 0;
 
     /**
      * @return the render target underlying this surface, may be NULL.
      */
     virtual GrRenderTarget* asRenderTarget() = 0;
@@ skipping 67 matching lines @@
     , fDesc(desc) {
     }
 
     GrTextureDesc fDesc;
 
 private:
     typedef GrResource INHERITED;
 };
 
 #endif // GrSurface_DEFINED