Update SkSpecialImage to be able to create tight SkImages and SkSurfaces

src/core/SkSpecialImage.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #ifndef SkSpecialImage_DEFINED
 #define SkSpecialImage_DEFINED
 
 #include "SkNextID.h"
 #include "SkRefCnt.h"
 
 // remove this when internal_getProxy goes away (see skbug.com/4965)
 #include "SkImageFilter.h"
 
 #include "SkImageInfo.h" // for SkAlphaType
 
 class GrContext;
 class GrTexture;
 class SkBitmap;
 class SkCanvas;
 class SkImage;
 struct SkImageInfo;
 class SkPaint;
 class SkPixmap;
 class SkSpecialSurface;
+class SkSurface;
 
 enum {
     kNeedNewImageUniqueID_SpecialImage = 0
 };
 
 /**
  * This is a restricted form of SkImage solely intended for internal use. It
  * differs from SkImage in that:
  *      - it can only be backed by raster or gpu (no generators)
  *      - it can be backed by a GrTexture larger than its nominal bounds
@@ skipping 39 matching lines @@
                                              uint32_t uniqueID,
                                              GrTexture*, 
                                              SkAlphaType at = kPremul_SkAlphaType);
     static sk_sp<SkSpecialImage> MakeFromPixmap(SkImageFilter::Proxy*,
                                                 const SkIRect& subset,
                                                 const SkPixmap&,
                                                 RasterReleaseProc,
                                                 ReleaseContext);
 
     /**
-     *  Create a new surface with a backend that is compatible with this image.
+     *  Create a new special surface with a backend that is compatible with this special image.
      */
     sk_sp<SkSpecialSurface> makeSurface(const SkImageInfo&) const;
 
     /**
+     * Create a new surface with a backend that is compatible with this special image.
+     * TODO: switch this to makeSurface once we resolved the naming issue
+     */
+    sk_sp<SkSurface> makeTightSurface(const SkImageInfo&) const;
+
+    /**
      * Extract a subset of this special image and return it as a special image.
      * It may or may not point to the same backing memory.
      */
     sk_sp<SkSpecialImage> makeSubset(const SkIRect& subset) const;
 
+    /**
+     * Extract a subset of this special image and return it as an SkImage.
+     * It may or may not point to the same backing memory.
+     * TODO: switch this to makeSurface once we resolved the naming issue
+     */
+    sk_sp<SkImage> makeTightSubset(const SkIRect& subset) const;
+
     // These three internal methods will go away (see skbug.com/4965)
     bool internal_getBM(SkBitmap* result);
     static sk_sp<SkSpecialImage> internal_fromBM(SkImageFilter::Proxy*, const SkBitmap&);
     SkImageFilter::Proxy* internal_getProxy() const;
 
     // TODO: hide this when GrLayerHoister uses SkSpecialImages more fully (see skbug.com/5063)
     /**
      *  If the SpecialImage is backed by a gpu texture, return that texture.
      *  The active portion of the texture can be retrieved via 'subset'.
      */
@@ skipping 37 matching lines @@
     const uint32_t  fUniqueID;
 
     // TODO: remove this ASAP (see skbug.com/4965)
     SkImageFilter::Proxy* fProxy;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif